Revision: 4264
http://geany.svn.sourceforge.net/geany/?rev=4264&view=rev
Author: ntrel
Date: 2009-09-29 12:10:17 +0000 (Tue, 29 Sep 2009)
Log Message:
-----------
Add utils_get_file_list_full() which can optionally sort or include
a full path for each list item.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/symbols.c
trunk/src/templates.c
trunk/src/utils.c
trunk/src/utils.h
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-09-29 11:39:35 UTC (rev 4263)
+++ trunk/ChangeLog 2009-09-29 12:10:17 UTC (rev 4264)
@@ -4,6 +4,9 @@
Change Perl tag parser to ctags SVN r601. This removes support for
buggy local/my/our but it parses constant/format/labels and should
be less buggy overall (closes #2861232).
+ * src/templates.c, src/utils.c, src/utils.h, src/symbols.c:
+ Add utils_get_file_list_full() which can optionally sort or include
+ a full path for each list item.
2009-09-28 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
Modified: trunk/src/symbols.c
===================================================================
--- trunk/src/symbols.c 2009-09-29 11:39:35 UTC (rev 4263)
+++ trunk/src/symbols.c 2009-09-29 12:10:17 UTC (rev 4264)
@@ -1444,18 +1444,6 @@
}
-static void utils_slist_add_path(GSList *list, const gchar *path)
-{
- GSList *node;
-
- for (node = list; node != NULL; node = g_slist_next(node))
- {
- setptr(node->data,
- g_build_path(G_DIR_SEPARATOR_S, path, node->data, NULL));
- }
-}
-
-
static GHashTable *init_user_tags(void)
{
GSList *file_list = NULL, *list = NULL;
@@ -1468,12 +1456,10 @@
{
utils_mkdir(dir, FALSE);
}
- file_list = utils_get_file_list(dir, NULL, NULL);
- utils_slist_add_path(file_list, dir);
+ file_list = utils_get_file_list_full(dir, TRUE, TRUE, NULL);
dir = utils_build_path(app->datadir, "tags", NULL);
- list = utils_get_file_list(dir, NULL, NULL);
- utils_slist_add_path(list, dir);
+ list = utils_get_file_list_full(dir, TRUE, TRUE, NULL);
file_list = g_slist_concat(file_list, list);
lang_hash = get_tagfile_hash(file_list);
Modified: trunk/src/templates.c
===================================================================
--- trunk/src/templates.c 2009-09-29 11:39:35 UTC (rev 4263)
+++ trunk/src/templates.c 2009-09-29 12:10:17 UTC (rev 4264)
@@ -529,24 +529,15 @@
{
gchar *path = g_build_path(G_DIR_SEPARATOR_S, app->configdir, GEANY_TEMPLATES_SUBDIR,
"files", NULL);
- GSList *list = NULL;
- GDir *dir;
- const gchar *fname;
+ GSList *list = utils_get_file_list_full(path, FALSE, FALSE, NULL);
- dir = g_dir_open(path, 0, NULL);
- if (dir)
+ if (!list)
{
- foreach_dir(fname, dir)
- list = g_slist_append(list, g_strdup(fname));
- g_dir_close(dir);
- }
- if (!dir || !list)
- {
utils_mkdir(path, FALSE);
return FALSE;
}
list = g_slist_sort(list, compare_filenames_by_filetype);
- g_slist_foreach(list, add_file_item, toolbar_new_file_menu);
+ g_slist_foreach(list, add_file_item, NULL);
g_slist_foreach(list, (GFunc) g_free, NULL);
g_slist_free(list);
g_free(path);
@@ -563,14 +554,14 @@
/* we hold our own ref on the menu in case it is not used in the toolbar */
g_object_ref(toolbar_new_file_menu);
- create_new_menu_items(toolbar_new_file_menu);
+ create_new_menu_items();
sep1 = gtk_separator_menu_item_new();
gtk_container_add(GTK_CONTAINER(new_with_template_menu), sep1);
sep2 = gtk_separator_menu_item_new();
gtk_container_add(GTK_CONTAINER(toolbar_new_file_menu), sep2);
- if (add_custom_template_items(toolbar_new_file_menu))
+ if (add_custom_template_items())
{
gtk_widget_show(sep1);
gtk_widget_show(sep2);
Modified: trunk/src/utils.c
===================================================================
--- trunk/src/utils.c 2009-09-29 11:39:35 UTC (rev 4263)
+++ trunk/src/utils.c 2009-09-29 12:10:17 UTC (rev 4264)
@@ -1341,36 +1341,35 @@
}
-/**
- * Gets a sorted list of files from the specified directory.
+/*
+ * Gets a list of files from the specified directory.
* Locale encoding is expected for @a path and used for the file list. The list and the data
* in the list should be freed after use, e.g.:
* @code
* g_slist_foreach(list, (GFunc) g_free, NULL);
* g_slist_free(list); @endcode
*
- * @note If you don't want sorted filenames you should use the foreach_dir() macro instead -
- * it's more efficient and perhaps easier to use than freeing the list and its contents.
+ * @note If you don't need a list you should use the foreach_dir() macro instead -
+ * it's more efficient.
*
* @param path The path of the directory to scan, in locale encoding.
- * @param length The location to store the number of non-@c NULL data items in the list,
- * unless @c NULL.
+ * @param full_path Whether to include the full path for each filename in the list. Obviously this
+ * will use more memory.
+ * @param sort Whether to sort alphabetically (UTF-8 safe).
* @param error The location for storing a possible error, or @c NULL.
*
- * @return A newly allocated list or @c NULL if no files found. The list and its data should be
- * freed when no longer needed.
+ * @return A newly allocated list or @c NULL if no files were found. The list and its data should be
+ * freed when no longer needed.
+ * @see utils_get_file_list().
**/
-GSList *utils_get_file_list(const gchar *path, guint *length, GError **error)
+GSList *utils_get_file_list_full(const gchar *path, gboolean full_path, gboolean sort, GError **error)
{
GSList *list = NULL;
- guint len = 0;
GDir *dir;
const gchar *filename;
if (error)
*error = NULL;
- if (length)
- *length = 0;
g_return_val_if_fail(path != NULL, NULL);
dir = g_dir_open(path, 0, error);
@@ -1379,15 +1378,40 @@
foreach_dir(filename, dir)
{
- list = g_slist_append(list, g_strdup(filename));
- len++;
+ list = g_slist_append(list, full_path ?
+ g_build_path(G_DIR_SEPARATOR_S, path, filename, NULL) : g_strdup(filename));
}
g_dir_close(dir);
/* sorting last is quicker than on insertion */
- list = g_slist_sort(list, (GCompareFunc) utils_str_casecmp);
+ if (sort)
+ list = g_slist_sort(list, (GCompareFunc) utils_str_casecmp);
+ return list;
+}
+
+/**
+ * Gets a sorted list of files from the specified directory.
+ * Locale encoding is expected for @a path and used for the file list. The list and the data
+ * in the list should be freed after use, e.g.:
+ * @code
+ * g_slist_foreach(list, (GFunc) g_free, NULL);
+ * g_slist_free(list); @endcode
+ *
+ * @param path The path of the directory to scan, in locale encoding.
+ * @param length The location to store the number of non-@c NULL data items in the list,
+ * unless @c NULL.
+ * @param error The location for storing a possible error, or @c NULL.
+ *
+ * @return A newly allocated list or @c NULL if no files were found. The list and its data should be
+ * freed when no longer needed.
+ * @see utils_get_file_list_full().
+ **/
+GSList *utils_get_file_list(const gchar *path, guint *length, GError **error)
+{
+ GSList *list = utils_get_file_list_full(path, FALSE, TRUE, error);
+
if (length)
- *length = len;
+ *length = g_slist_length(list);
return list;
}
Modified: trunk/src/utils.h
===================================================================
--- trunk/src/utils.h 2009-09-29 11:39:35 UTC (rev 4263)
+++ trunk/src/utils.h 2009-09-29 12:10:17 UTC (rev 4264)
@@ -215,4 +215,6 @@
gchar *utils_str_remove_chars(gchar *string, const gchar *chars);
+GSList *utils_get_file_list_full(const gchar *path, gboolean full_path, gboolean sort, GError **error);
+
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 4259
http://geany.svn.sourceforge.net/geany/?rev=4259&view=rev
Author: ntrel
Date: 2009-09-28 16:24:58 +0000 (Mon, 28 Sep 2009)
Log Message:
-----------
Show build 'Compilation failed' message in blue also, to distinguish it from build output.
Modified Paths:
--------------
trunk/src/build.c
Modified: trunk/src/build.c
===================================================================
--- trunk/src/build.c 2009-09-28 16:14:24 UTC (rev 4258)
+++ trunk/src/build.c 2009-09-28 16:24:58 UTC (rev 4259)
@@ -1025,7 +1025,7 @@
if (failure)
{
msg = _("Compilation failed.");
- msgwin_compiler_add_string(COLOR_DARK_RED, msg);
+ msgwin_compiler_add_string(COLOR_BLUE, msg);
/* If msgwindow is hidden, user will want to display it to see the error */
if (! ui_prefs.msgwindow_visible)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 4255
http://geany.svn.sourceforge.net/geany/?rev=4255&view=rev
Author: ntrel
Date: 2009-09-28 15:28:25 +0000 (Mon, 28 Sep 2009)
Log Message:
-----------
Update notes about data/filetypes.foo configuration file [styling] section.
Modified Paths:
--------------
trunk/HACKING
Modified: trunk/HACKING
===================================================================
--- trunk/HACKING 2009-09-28 15:17:16 UTC (rev 4254)
+++ trunk/HACKING 2009-09-28 15:28:25 UTC (rev 4255)
@@ -302,18 +302,11 @@
For syntax highlighting, you will need to edit highlighting.c and add
the following things:
-1. Write styleset_foo_init() to setup default styles and load style
+1. Write styleset_foo_init() to setup lexer styles and load style
settings from the filetypes.foo configuration file. You should probably
start by copying and adapting another filetype's initialization, such
as styleset_tcl_init(). Another way is to use load_style_entries()
to make style initialization simpler - see styleset_c_like_init().
-
-.. note::
- Please try to make your styles fit in with the other filetypes' default
- colors, and to use named styles where possible. Filetypes that share a
- lexer should have the same colors. Normally, styles should leave the
- background color empty to match the default color.
-
2. Write styleset_foo() to apply styles when a new scintilla widget
is created. Again you could copy and adapt a function like
styleset_tcl().
@@ -321,7 +314,16 @@
``init_styleset_case(GEANY_FILETYPES_FOO, styleset_foo_init);``.
4. In highlighting_set_styles(), add
``styleset_case(GEANY_FILETYPES_FOO, styleset_foo);``.
+5. Write data/filetypes.foo configuration file [styling] section. See
+ the manual and see data/filetypes.d for a named style example.
+.. note::
+ Please try to make your styles fit in with the other filetypes'
+ default colors, and to use named styles where possible (e.g.
+ "commentline=comment"). Filetypes that share a lexer should have
+ the same colors. If not using named styles, leave the background color
+ empty to match the default color.
+
Error message parsing
^^^^^^^^^^^^^^^^^^^^^
New-style error message parsing is done with an extended GNU-style regex
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.