Commits October 2006

commits@lists.geany.org

2 participants
93 discussions

SF.net SVN: geany: [869] trunk
by eht16＠users.sourceforge.net 07 Oct '06

07 Oct '06

Revision: 869 http://svn.sourceforge.net/geany/?rev=869&view=rev Author: eht16 Date: 2006-10-06 16:23:05 -0700 (Fri, 06 Oct 2006) Log Message: ----------- Implemented simple "shebang" detection. Modified Paths: -------------- trunk/ChangeLog trunk/src/document.c trunk/src/filetypes.c trunk/src/filetypes.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-10-06 22:29:04 UTC (rev 868) +++ trunk/ChangeLog 2006-10-06 23:23:05 UTC (rev 869) @@ -1,6 +1,9 @@ 2006-10-06 Enrico Tröger <enrico.troeger(a)uvena.de> * tagmanager/python.c: Improved Python parser to support nested classes. + * src/filetypes.c, src/document.c: + Implemented simple "shebang" detection. It is used prior to the + filename extension detection. 2006-10-04 Enrico Tröger <enrico.troeger(a)uvena.de> Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2006-10-06 22:29:04 UTC (rev 868) +++ trunk/src/document.c 2006-10-06 23:23:05 UTC (rev 869) @@ -660,7 +660,7 @@ if (! reload) { - filetype *use_ft = (ft != NULL) ? ft : filetypes_get_from_filename(utf8_filename); + filetype *use_ft = (ft != NULL) ? ft : filetypes_get_from_filename(idx); doc_list[idx].readonly = readonly; sci_set_readonly(doc_list[idx].sci, readonly); @@ -828,7 +828,7 @@ doc_list[idx].mtime = time(NULL); if (doc_list[idx].file_type == NULL || doc_list[idx].file_type->id == GEANY_FILETYPES_ALL) { - doc_list[idx].file_type = filetypes_get_from_filename(doc_list[idx].file_name); + doc_list[idx].file_type = filetypes_get_from_filename(idx); filetypes_select_radio_item(doc_list[idx].file_type); } document_set_filetype(idx, doc_list[idx].file_type); Modified: trunk/src/filetypes.c =================================================================== --- trunk/src/filetypes.c 2006-10-06 22:29:04 UTC (rev 868) +++ trunk/src/filetypes.c 2006-10-06 23:23:05 UTC (rev 869) @@ -31,6 +31,8 @@ #include "templates.h" #include "msgwindow.h" #include "utils.h" +#include "document.h" +#include "sciwrappers.h" /* This is the order of unique ids used in the config file. @@ -111,7 +113,7 @@ /* inits the filetype array and fill it with the known filetypes * and create the filetype menu*/ -void filetypes_init_types(void) +void filetypes_init_types() { GtkWidget *filetype_menu = lookup_widget(app->window, "set_filetype1_menu"); GtkWidget *template_menu = lookup_widget(app->window, "menu_new_with_template1_menu"); @@ -693,18 +695,67 @@ } +static filetype *find_shebang(gint idx) +{ + gchar *line = sci_get_line(doc_list[idx].sci, 0); + filetype *ft = NULL; + + if (strlen(line) > 2 && line[0] == '#' && line[1]=='!') + { + /// TODO does g_path_get_basename() also work under Win32 for Unix filenames? + gchar *basename_interpreter = g_path_get_basename(line + 2); + + if (strncmp(basename_interpreter, "sh", 2) == 0) + ft = filetypes[GEANY_FILETYPES_SH]; + else if (strncmp(basename_interpreter, "bash", 4) == 0) + ft = filetypes[GEANY_FILETYPES_SH]; + else if (strncmp(basename_interpreter, "perl", 4) == 0) + ft = filetypes[GEANY_FILETYPES_PERL]; + else if (strncmp(basename_interpreter, "python", 6) == 0) + ft = filetypes[GEANY_FILETYPES_PYTHON]; + else if (strncmp(basename_interpreter, "php", 3) == 0) + ft = filetypes[GEANY_FILETYPES_PHP]; + else if (strncmp(basename_interpreter, "ruby", 4) == 0) + ft = filetypes[GEANY_FILETYPES_RUBY]; + else if (strncmp(basename_interpreter, "tcl", 3) == 0) + ft = filetypes[GEANY_FILETYPES_TCL]; + else if (strncmp(basename_interpreter, "zsh", 3) == 0) + ft = filetypes[GEANY_FILETYPES_SH]; + else if (strncmp(basename_interpreter, "ksh", 3) == 0) + ft = filetypes[GEANY_FILETYPES_SH]; + else if (strncmp(basename_interpreter, "csh", 3) == 0) + ft = filetypes[GEANY_FILETYPES_SH]; + // what else to add? + + g_free(basename_interpreter); + } + + g_free(line); + return ft; +} + + /* simple filetype selection based on the filename extension */ -filetype *filetypes_get_from_filename(const gchar *filename) +filetype *filetypes_get_from_filename(gint idx) { GPatternSpec *pattern; + filetype *ft; + gchar *filename; gchar *base_filename, *utf8_filename; gint i, j; - if (filename == NULL) - { + if (! DOC_IDX_VALID(idx)) return filetypes[GEANY_FILETYPES_ALL]; - } + // try to find a shebang and if found use it prior to the filename extension + ft = find_shebang(idx); + if (ft != NULL) return ft; + + if (doc_list[idx].file_name == NULL) + return filetypes[GEANY_FILETYPES_ALL]; + else + filename = doc_list[idx].file_name; + // try to get the UTF-8 equivalent for the filename utf8_filename = g_locale_to_utf8(filename, -1, NULL, NULL, NULL); if (utf8_filename == NULL) @@ -774,7 +825,7 @@ /* frees the array and all related pointers */ -void filetypes_free_types(void) +void filetypes_free_types() { gint i; Modified: trunk/src/filetypes.h =================================================================== --- trunk/src/filetypes.h 2006-10-06 22:29:04 UTC (rev 868) +++ trunk/src/filetypes.h 2006-10-06 23:23:05 UTC (rev 869) @@ -113,13 +113,13 @@ /* inits the filetype array and fill it with the known filetypes * and create the filetype menu*/ -void filetypes_init_types(void); +void filetypes_init_types(); /* simple filetype selection based on the filename extension */ -filetype *filetypes_get_from_filename(const gchar *filename); +filetype *filetypes_get_from_filename(gint idx); /* frees the array and all related pointers */ -void filetypes_free_types(void); +void filetypes_free_types(); gchar *filetypes_get_template(filetype *ft); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [868] trunk/tagmanager/tm_source_file.c
by eht16＠users.sourceforge.net 07 Oct '06

07 Oct '06

Revision: 868 http://svn.sourceforge.net/geany/?rev=868&view=rev Author: eht16 Date: 2006-10-06 15:29:04 -0700 (Fri, 06 Oct 2006) Log Message: ----------- Parse files only once instead of three times. Modified Paths: -------------- trunk/tagmanager/tm_source_file.c Modified: trunk/tagmanager/tm_source_file.c =================================================================== --- trunk/tagmanager/tm_source_file.c 2006-10-06 22:13:24 UTC (rev 867) +++ trunk/tagmanager/tm_source_file.c 2006-10-06 22:29:04 UTC (rev 868) @@ -49,7 +49,7 @@ TagEntryFunction = tm_source_file_tags; } - if (name == NULL) + if (name == NULL) source_file->lang = LANG_AUTO; else source_file->lang = getNamedLanguage(name); @@ -114,14 +114,16 @@ TagEntryFunction = tm_source_file_tags; } current_source_file = source_file; - + if (LANG_AUTO == source_file->lang) source_file->lang = getFileLanguage (file_name); if (source_file->lang < 0 || ! LanguageTable [source_file->lang]->enabled) return status; - - while ((TRUE == status) && (passCount < 3)) + + //while ((TRUE == status) && (passCount < 3)) + // parse files only once instead of three times until we know why + while ((TRUE == status) && (passCount < 1)) { if (source_file->work_object.tags_array) tm_tags_array_free(source_file->work_object.tags_array, FALSE); @@ -135,7 +137,7 @@ } else { - g_warning("Unable to open %s", file_name); + g_warning("%s: Unable to open %s", __func__, file_name); return FALSE; } ++ passCount; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [867] trunk
by eht16＠users.sourceforge.net 07 Oct '06

07 Oct '06

Revision: 867 http://svn.sourceforge.net/geany/?rev=867&view=rev Author: eht16 Date: 2006-10-06 15:13:24 -0700 (Fri, 06 Oct 2006) Log Message: ----------- Improved Python parser to support nested classes. Modified Paths: -------------- trunk/ChangeLog trunk/tagmanager/python.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-10-04 19:14:57 UTC (rev 866) +++ trunk/ChangeLog 2006-10-06 22:13:24 UTC (rev 867) @@ -1,3 +1,8 @@ +2006-10-06 Enrico Tröger <enrico.troeger(a)uvena.de> + + * tagmanager/python.c: Improved Python parser to support nested classes. + + 2006-10-04 Enrico Tröger <enrico.troeger(a)uvena.de> * src/ui_utils.c, src/main.c, src/document.c, src/callbacks.c: Modified: trunk/tagmanager/python.c =================================================================== --- trunk/tagmanager/python.c 2006-10-04 19:14:57 UTC (rev 866) +++ trunk/tagmanager/python.c 2006-10-06 22:13:24 UTC (rev 867) @@ -13,7 +13,7 @@ * INCLUDE FILES */ #include "general.h" /* must always come first */ - +#include <glib.h> #include <string.h> #include "parse.h" @@ -33,21 +33,55 @@ { TRUE, 'm', "member", "methods" } }; +typedef struct _lastClass { + gchar *name; + gint indent; +} lastClass; + /* * FUNCTION DEFINITIONS */ + +// remove all previous classes with more indent than the current one +static GList *clean_class_list(GList *list, gint indent) +{ + GList *tmp, *tmp2; + + tmp = g_list_first(list); + while (tmp != NULL) + { + if (((lastClass*)tmp->data)->indent >= indent) + { + g_free(((lastClass*)tmp->data)->name); + g_free(tmp->data); + tmp2 = tmp->next; + + list = g_list_remove(list, tmp->data); + tmp = tmp2; + } + else + { + tmp = tmp->next; + } + } + + return list; +} + + static void findPythonTags (void) { + GList *parents = NULL, *tmp; // list of classes which are around the token vString *name = vStringNew (); - vString *lastClass = vStringNew(); + gint indent; const unsigned char *line; boolean inMultilineString = FALSE; while ((line = fileReadLine ()) != NULL) { const unsigned char *cp = line; - + indent = 0; while (*cp != '\0') { if (*cp=='"' && @@ -62,33 +96,60 @@ inMultilineString = (boolean) !inMultilineString; cp += 3; } - if (inMultilineString || isspace ((int) *cp)) + + if (inMultilineString) ++cp; + else if (isspace ((int) *cp)) + { + cp++; + // count indentation amount of current line + indent++; + /// TODO should be improved by separating between tabs and spaces but to do this we + /// have to know the tabulator width which is set in geany and not available here + } else if (*cp == '#') break; else if (strncmp ((const char*) cp, "class", (size_t) 5) == 0) { - cp += 5; - if (isspace ((int) *cp)) - { - while (isspace ((int) *cp)) - ++cp; - while (isalnum ((int) *cp) || *cp == '_') - { - vStringPut (name, (int) *cp); - ++cp; - } - vStringTerminate (name); - makeSimpleTag (name, PythonKinds, K_CLASS); - vStringCopy (lastClass, name); - vStringClear (name); - } + cp += 5; + if (isspace ((int) *cp)) + { + GList *last = g_list_last(parents); + lastClass *lastclass = NULL; + lastClass *newclass = g_new(lastClass, 1); + + if (last != NULL) lastclass = last->data; + + while (isspace ((int) *cp)) + ++cp; + while (isalnum ((int) *cp) || *cp == '_') + { + vStringPut (name, (int) *cp); + ++cp; + } + vStringTerminate (name); + + parents = clean_class_list(parents, indent); + + newclass->name = g_strdup(vStringValue(name)); + newclass->indent = indent; + parents = g_list_append(parents, newclass); + makeSimpleTag (name, PythonKinds, K_CLASS); + vStringClear (name); + } } else if (strncmp ((const char*) cp, "def", (size_t) 3) == 0) { cp += 3; if (isspace ((int) *cp)) { + GList *last; + lastClass *lastclass = NULL; + + parents = clean_class_list(parents, indent); + last = g_list_last(parents); + if (last != NULL) lastclass = last->data; + while (isspace ((int) *cp)) ++cp; while (isalnum ((int) *cp) || *cp == '_') @@ -97,12 +158,11 @@ ++cp; } vStringTerminate (name); - if (!isspace(*line) || vStringLength(lastClass) <= 0) + if (!isspace(*line) || lastclass == NULL || strlen(lastclass->name) <= 0) makeSimpleTag (name, PythonKinds, K_FUNCTION); else makeSimpleScopedTag (name, PythonKinds, K_METHOD, - PythonKinds[K_CLASS].name, - vStringValue(lastClass), "public"); + PythonKinds[K_CLASS].name, lastclass->name, "public"); vStringClear (name); } } @@ -115,7 +175,19 @@ } } vStringDelete (name); - vStringDelete (lastClass); + + // clear the remaining elements in the list + tmp = g_list_first(parents); + while (tmp != NULL) + { + if (tmp->data) + { + g_free(((lastClass*)tmp->data)->name); + g_free(tmp->data); + } + tmp = tmp->next; + } + g_list_free(parents); } extern parserDefinition* PythonParser (void) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [866] trunk
by eht16＠users.sourceforge.net 05 Oct '06

05 Oct '06

Revision: 866 http://svn.sourceforge.net/geany/?rev=866&view=rev Author: eht16 Date: 2006-10-04 12:14:57 -0700 (Wed, 04 Oct 2006) Log Message: ----------- Fixed crash when using "Make object" on new files(closes #1570818). Modified Paths: -------------- trunk/ChangeLog trunk/src/callbacks.c trunk/src/document.c trunk/src/filetypes.c trunk/src/filetypes.h trunk/src/main.c trunk/src/ui_utils.c trunk/src/ui_utils.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-10-03 17:54:02 UTC (rev 865) +++ trunk/ChangeLog 2006-10-04 19:14:57 UTC (rev 866) @@ -1,3 +1,11 @@ +2006-10-04 Enrico Tröger <enrico.troeger(a)uvena.de> + + * src/ui_utils.c, src/main.c, src/document.c, src/callbacks.c: + Renamed ui_build_show_hide() in ui_update_build_menu(). + * src/filetypes.c, src/ui_utils.c: + Fixed crash when using "Make object" on new files(closes #1570818). + + 2006-10-03 Enrico Tröger <enrico.troeger(a)uvena.de> * src/callbacks.c: Save configuration(i.e. list of open files) as late Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2006-10-03 17:54:02 UTC (rev 865) +++ trunk/src/callbacks.c 2006-10-04 19:14:57 UTC (rev 866) @@ -759,7 +759,7 @@ document_set_text_changed(idx); ui_document_show_hide(idx); // update the document menu - ui_build_show_hide(idx); + ui_update_build_menu(idx); ui_update_statusbar(idx, -1); ui_set_window_title(idx); ui_update_tag_list(idx, FALSE); @@ -930,7 +930,7 @@ utils_replace_filename(idx); document_save_file(idx, TRUE); - ui_build_show_hide(idx); + ui_update_build_menu(idx); // finally add current file to recent files menu ui_add_recent_file(doc_list[idx].file_name); @@ -1648,21 +1648,25 @@ case 2: //make object { gchar *locale_filename, *short_file, *noext, *object_file; //temp - locale_filename = utils_get_locale_from_utf8(doc_list[idx].file_name); - short_file = g_path_get_basename(locale_filename); - g_free(locale_filename); + if (doc_list[idx].file_name != NULL) + { + locale_filename = utils_get_locale_from_utf8(doc_list[idx].file_name); - noext = utils_remove_ext_from_filename(short_file); - g_free(short_file); + short_file = g_path_get_basename(locale_filename); + g_free(locale_filename); - object_file = g_strdup_printf("%s.o", noext); - g_free(noext); + noext = utils_remove_ext_from_filename(short_file); + g_free(short_file); - g_free(app->build_make_custopt); - app->build_make_custopt = g_strdup(object_file); - g_free(object_file); - make_object = TRUE; + object_file = g_strdup_printf("%s.o", noext); + g_free(noext); + + g_free(app->build_make_custopt); + app->build_make_custopt = g_strdup(object_file); + g_free(object_file); + make_object = TRUE; + } } // fall through Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2006-10-03 17:54:02 UTC (rev 865) +++ trunk/src/document.c 2006-10-04 19:14:57 UTC (rev 866) @@ -354,7 +354,7 @@ ui_set_window_title(-1); ui_save_buttons_toggle(FALSE); ui_close_buttons_toggle(); - ui_build_show_hide(-1); + ui_update_build_menu(-1); } } else geany_debug("Error: idx: %d page_num: %d", idx, page_num); @@ -389,7 +389,7 @@ document_set_filetype(idx, ft); // also clears taglist if (ft == NULL) filetypes[GEANY_FILETYPES_ALL]->style_func_ptr(doc_list[idx].sci); ui_set_window_title(idx); - ui_build_show_hide(idx); + ui_update_build_menu(idx); doc_list[idx].mtime = time(NULL); doc_list[idx].changed = FALSE; document_set_text_changed(idx); @@ -666,7 +666,7 @@ sci_set_readonly(doc_list[idx].sci, readonly); document_set_filetype(idx, use_ft); // also sets taglist - ui_build_show_hide(idx); + ui_update_build_menu(idx); } else { // reloading @@ -1197,7 +1197,7 @@ } } sci_colourise(doc_list[idx].sci, 0, -1); - ui_build_show_hide(idx); + ui_update_build_menu(idx); } Modified: trunk/src/filetypes.c =================================================================== --- trunk/src/filetypes.c 2006-10-03 17:54:02 UTC (rev 865) +++ trunk/src/filetypes.c 2006-10-04 19:14:57 UTC (rev 866) @@ -805,6 +805,9 @@ if (filetypes[i]->menu_items->item_exec != NULL && GTK_IS_WIDGET(filetypes[i]->menu_items->item_exec)) gtk_widget_destroy(filetypes[i]->menu_items->item_exec); + if (filetypes[i]->menu_items->item_make_object != NULL && + GTK_IS_WIDGET(filetypes[i]->menu_items->item_make_object)) + gtk_widget_destroy(filetypes[i]->menu_items->item_make_object); */ g_free(filetypes[i]->menu_items); g_strfreev(filetypes[i]->pattern); @@ -941,7 +944,7 @@ gchar *fname, *ext, *data; if (! bp->modified) continue; - + ext = get_conf_extension(i); fname = g_strconcat(conf_prefix, ext, NULL); g_free(ext); Modified: trunk/src/filetypes.h =================================================================== --- trunk/src/filetypes.h 2006-10-03 17:54:02 UTC (rev 865) +++ trunk/src/filetypes.h 2006-10-04 19:14:57 UTC (rev 866) @@ -70,6 +70,7 @@ GtkWidget *item_compile; GtkWidget *item_link; GtkWidget *item_exec; + GtkWidget *item_make_object; gboolean can_compile; gboolean can_link; gboolean can_exec; Modified: trunk/src/main.c =================================================================== --- trunk/src/main.c 2006-10-03 17:54:02 UTC (rev 865) +++ trunk/src/main.c 2006-10-04 19:14:57 UTC (rev 866) @@ -608,7 +608,7 @@ idx = document_get_cur_idx(); gtk_widget_grab_focus(GTK_WIDGET(doc_list[idx].sci)); gtk_tree_model_foreach(GTK_TREE_MODEL(tv.store_openfiles), treeviews_find_node, GINT_TO_POINTER(idx)); - ui_build_show_hide(idx); + ui_update_build_menu(idx); ui_update_tag_list(idx, FALSE); #ifdef G_OS_WIN32 Modified: trunk/src/ui_utils.c =================================================================== --- trunk/src/ui_utils.c 2006-10-03 17:54:02 UTC (rev 865) +++ trunk/src/ui_utils.c 2006-10-04 19:14:57 UTC (rev 866) @@ -618,7 +618,7 @@ } -void ui_build_show_hide(gint idx) +void ui_update_build_menu(gint idx) { gboolean is_header = FALSE; gchar *ext = NULL; @@ -671,7 +671,7 @@ gtk_menu_item_set_submenu(GTK_MENU_ITEM(lookup_widget(app->window, "menu_build1")), ft->menu_items->menu); - if (is_header) + if (is_header) // means also filename is NULL { gtk_widget_set_sensitive(app->compile_button, FALSE); gtk_widget_set_sensitive(app->run_button, FALSE); @@ -681,6 +681,7 @@ gtk_widget_set_sensitive(ft->menu_items->item_link, FALSE); if (ft->menu_items->can_exec) gtk_widget_set_sensitive(ft->menu_items->item_exec, FALSE); + gtk_widget_set_sensitive(ft->menu_items->item_make_object, FALSE); } else { @@ -692,8 +693,8 @@ gtk_widget_set_sensitive(ft->menu_items->item_link, TRUE); if (ft->menu_items->can_exec) gtk_widget_set_sensitive(ft->menu_items->item_exec, TRUE); + gtk_widget_set_sensitive(ft->menu_items->item_make_object, TRUE); } - break; } case GEANY_FILETYPES_LATEX: @@ -709,7 +710,7 @@ ft->menu_items->menu); gtk_widget_set_sensitive(app->compile_button, FALSE); gtk_widget_set_sensitive(app->run_button, FALSE); - } + } else { gtk_menu_item_set_submenu(GTK_MENU_ITEM(lookup_widget(app->window, "menu_build1")), @@ -738,6 +739,7 @@ if (ft->menu_items->can_link) gtk_widget_set_sensitive(ft->menu_items->item_link, FALSE); if (ft->menu_items->can_exec) gtk_widget_set_sensitive(ft->menu_items->item_exec, FALSE); + gtk_widget_set_sensitive(ft->menu_items->item_make_object, FALSE); } else { @@ -751,6 +753,7 @@ gtk_widget_set_sensitive(ft->menu_items->item_link, TRUE); if (ft->menu_items->can_exec) gtk_widget_set_sensitive(ft->menu_items->item_exec, TRUE); + gtk_widget_set_sensitive(ft->menu_items->item_make_object, TRUE); } } } @@ -832,6 +835,7 @@ gtk_tooltips_set_tip(tooltips, item, _("Compiles the current file using the " "make tool"), NULL); g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_build_make_activate), GINT_TO_POINTER(2)); + ft->menu_items->item_make_object = item; #endif if (ft->menu_items->can_exec) @@ -1378,7 +1382,7 @@ align = gtk_alignment_new (0.5, 0.5, 1, 1); gtk_container_add (GTK_CONTAINER (frame), align); - gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, 0, 12, 0); + gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, 0, 12, 0); label_markup = g_strconcat("<b>", label_text, "</b>", NULL); label = gtk_label_new (label_markup); Modified: trunk/src/ui_utils.h =================================================================== --- trunk/src/ui_utils.h 2006-10-03 17:54:02 UTC (rev 865) +++ trunk/src/ui_utils.h 2006-10-04 19:14:57 UTC (rev 866) @@ -68,7 +68,7 @@ void ui_widget_show_hide(GtkWidget *widget, gboolean show); -void ui_build_show_hide(gint); +void ui_update_build_menu(gint); void ui_treeviews_show_hide(gboolean force); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [865] trunk/src/callbacks.c
by eht16＠users.sourceforge.net 03 Oct '06

03 Oct '06

Revision: 865 http://svn.sourceforge.net/geany/?rev=865&view=rev Author: eht16 Date: 2006-10-03 10:54:02 -0700 (Tue, 03 Oct 2006) Log Message: ----------- Fixed bug which caused not saving session files when quitting Geany(introduced with r862). Modified Paths: -------------- trunk/src/callbacks.c Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2006-10-03 13:45:30 UTC (rev 864) +++ trunk/src/callbacks.c 2006-10-03 17:54:02 UTC (rev 865) @@ -191,21 +191,21 @@ { if (app->pref_main_confirm_exit) { - // there is the chance that the user cancel the exit process while closing open - // files, so save the configuration(i.e. the list of open files) first - configuration_save(); if (dialogs_show_question_full(GTK_STOCK_QUIT, GTK_STOCK_CANCEL, NULL, _("Do you really want to quit?")) && on_close_all1_activate(NULL, NULL)) { + configuration_save(); destroyapp(NULL, gdata); } else app->quitting = FALSE; } else { + // there is the chance that the user cancel the exit process while closing open + // files, so save the configuration(i.e. the list of open files) first + configuration_save(); if (on_close_all1_activate(NULL, NULL)) { - configuration_save(); destroyapp(NULL, gdata); } else app->quitting = FALSE; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [864] trunk
by eht16＠users.sourceforge.net 03 Oct '06

03 Oct '06

Revision: 864 http://svn.sourceforge.net/geany/?rev=864&view=rev Author: eht16 Date: 2006-10-03 06:45:30 -0700 (Tue, 03 Oct 2006) Log Message: ----------- Added keyword "until". Modified Paths: -------------- trunk/ChangeLog trunk/data/filetypes.sh trunk/src/highlighting.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-10-03 13:16:42 UTC (rev 863) +++ trunk/ChangeLog 2006-10-03 13:45:30 UTC (rev 864) @@ -7,6 +7,7 @@ Reordered command line options alphabetically. Added new command line option --line to set the initial line for the first opened file. + * data/filetypes.sh, src/highlighting.c: Added keyword "until". 2006-10-02 Nick Treleaven <nick.treleaven(a)btinternet.com> Modified: trunk/data/filetypes.sh =================================================================== --- trunk/data/filetypes.sh 2006-10-03 13:16:42 UTC (rev 863) +++ trunk/data/filetypes.sh 2006-10-03 13:45:30 UTC (rev 864) @@ -14,7 +14,7 @@ scalar=0x105090;0xffffff;false;false [keywords] -primary=break case continue do done elif else esac eval exit export fi for function goto if in integer return set shift then while +primary=break case continue do done elif else esac eval exit export fi for function goto if in integer return set shift then until while [settings] Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2006-10-03 13:16:42 UTC (rev 863) +++ trunk/src/highlighting.c 2006-10-03 13:45:30 UTC (rev 864) @@ -1638,7 +1638,7 @@ get_keyfile_hex(config, config_home, "styling", "scalar", "0x105090", "0xffffff", "false", &style_sets[GEANY_FILETYPES_SH].styling[10]); style_sets[GEANY_FILETYPES_SH].keywords = g_new(gchar*, 2); - get_keyfile_keywords(config, config_home, "keywords", "primary", GEANY_FILETYPES_SH, 0, "break case continue do done elif else esac eval exit export fi for goto if in integer return set shift then while"); + get_keyfile_keywords(config, config_home, "keywords", "primary", GEANY_FILETYPES_SH, 0, "break case continue do done elif else esac eval exit export fi for goto if in integer return set shift then until while"); style_sets[GEANY_FILETYPES_SH].keywords[1] = NULL; get_keyfile_wordchars(config, config_home, GEANY_WORDCHARS, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [863] trunk
by eht16＠users.sourceforge.net 03 Oct '06

03 Oct '06

Revision: 863 http://svn.sourceforge.net/geany/?rev=863&view=rev Author: eht16 Date: 2006-10-03 06:16:42 -0700 (Tue, 03 Oct 2006) Log Message: ----------- Reordered command line options alphabetically. Added new command line option --line to set the initial line for the first opened file. Modified Paths: -------------- trunk/ChangeLog trunk/doc/geany.1.in trunk/doc/geany.docbook trunk/src/document.c trunk/src/main.c trunk/src/main.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-10-03 11:21:36 UTC (rev 862) +++ trunk/ChangeLog 2006-10-03 13:16:42 UTC (rev 863) @@ -3,6 +3,10 @@ * src/callbacks.c: Save configuration(i.e. list of open files) as late as possible and save the filetype build commands first shortly before quitting. + * doc/geany.docbook, doc/geany.1.in, src/main.c, src/document.c: + Reordered command line options alphabetically. + Added new command line option --line to set the initial line for the + first opened file. 2006-10-02 Nick Treleaven <nick.treleaven(a)btinternet.com> Modified: trunk/doc/geany.1.in =================================================================== --- trunk/doc/geany.1.in 2006-10-03 11:21:36 UTC (rev 862) +++ trunk/doc/geany.1.in 2006-10-03 13:16:42 UTC (rev 863) @@ -1,4 +1,4 @@ -.TH "GEANY" "1" "September 29, 2006" "@PACKAGE@ @VERSION@" "" +.TH "GEANY" "1" "October 03, 2006" "@PACKAGE@ @VERSION@" "" .SH "NAME" Geany \(em a small and lightweight IDE .SH "SYNOPSIS" @@ -13,40 +13,45 @@ .PP Homepage: http://geany.uvena.de +Set initial line number for the first opened file + .SH "OPTIONS" +.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 +Runs Geany in debug mode, which means being verbose and printing lots of information. +.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 +Set initial line number for the first opened file. +.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 Don't load auto completion and call tip data. Use this option, if you don't want to use them. For more information please see documentation. -.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-i\fP \fB\-\-new-instance\fP " 10 -Don't open files in a running instance, force opening a new instance. .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 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. -.IP "\fB-l\fP \fB\-\-vte-lib\fP " 10 +automatically disabled. Only available if Geany was compiled with support for VTE. +.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. -.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 -Runs geany in debug mode, which means being verbose and printing lots of information. +work. Only available if Geany was compiled with support for VTE. +.IP "\fB-v\fP \fB\-\-version\fP " 10 +Show version information and exit. .IP "\fB-?\fP \fB\-\-help\fP " 10 Show help information and exit. -.IP "\fB-v\fP \fB\-\-version\fP " 10 -Show version information and exit. .PP -geany supports all generic GTK options, a list is available on the help screen. +Geany supports all generic GTK options, a list is available on the help screen. .SH "AUTHOR" .PP -This manual page was written by Enrico Troeger <enrico.troeger(a)uvena.de>. Permission is +This manual page was written by Enrico Tröger <enrico.troeger(a)uvena.de>. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 any later version published by the Free Software Foundation. Modified: trunk/doc/geany.docbook =================================================================== --- trunk/doc/geany.docbook 2006-10-03 11:21:36 UTC (rev 862) +++ trunk/doc/geany.docbook 2006-10-03 13:16:42 UTC (rev 863) @@ -236,19 +236,35 @@ </thead> <tbody> <row> - <entry>-s</entry> - <entry>--no-session</entry> - <entry>Don't load the previous session's files. + <entry>-c dir_name</entry> + <entry>--config=directory_name</entry> + <entry>Use an alternate configuration directory. Default + configuration directory is <filename>~/.&app_small;/</filename> + and there resides <filename>&app_small;.conf</filename> and + other configuration files. </entry> </row> <row> - <entry>-n</entry> - <entry>--no-ctags</entry> - <entry>Do not load auto completion and call tip data. - Use this option if you do not want to use them. + <entry>-d</entry> + <entry>--debug</entry> + <entry>Run &app; in debug mode, which means being verbose + and printing lots of information. </entry> </row> <row> + <entry>-i</entry> + <entry>--new-instance</entry> + <entry>Do not open files in a running instance, force opening a new instance. + Only available if &app; was compiled with support for Sockets. + </entry> + </row> + <row> + <entry>-l</entry> + <entry>--line</entry> + <entry>Set initial line number for the first opened file. + </entry> + </row> + <row> <entry>-m</entry> <entry>--no-msgwin</entry> <entry>Do not show the message window. Use this option if you do not @@ -256,56 +272,49 @@ </entry> </row> <row> - <entry>-i</entry> - <entry>--new-instance</entry> - <entry>Do not open files in a running instance, force opening a new instance. + <entry>-n</entry> + <entry>--no-ctags</entry> + <entry>Do not load auto completion and call tip data. + Use this option if you do not want to use them. </entry> </row> <row> + <entry>-s</entry> + <entry>--no-session</entry> + <entry>Don't load the previous session's files. + </entry> + </row> + <row> <entry>-t</entry> <entry>--no-terminal</entry> <entry>Do not load terminal support. Use this option if you do not want to load the virtual terminal emulator widget at startup. If you do not have <filename>libvte.so.4</filename> installed, - then terminal-support is automatically disabled. + then terminal-support is automatically disabled. Only available + if &app; was compiled with support for VTE. </entry> </row> <row> - <entry>-l</entry> + <entry></entry> <entry>--vte-lib</entry> <entry>Specify explicitly the path including filename or only the filename to the VTE library, e.g. <filename>/usr/lib/libvte.so</filename> or <filename>libvte.so</filename>. This option is only needed when the - autodetection does not work. + autodetection does not work. Only available if &app; was compiled + with support for VTE. </entry> </row> <row> - <entry>-c directory_name</entry> - <entry>--config=directory_name</entry> - <entry>Use an alternate configuration directory. Default - configuration directory is <filename>~/.&app_small;/</filename> - and there resides <filename>&app_small;.conf</filename> and - other configuration files. - </entry> + <entry>-v</entry> + <entry>--version</entry> + <entry>Show version information and exit.</entry> </row> <row> - <entry>-d</entry> - <entry>--debug</entry> - <entry>Run &app; in debug mode, which means being verbose - and printing lots of information. - </entry> - </row> - <row> <entry>-?</entry> <entry>--help</entry> <entry>Show help information and exit.</entry> </row> <row> - <entry>-v</entry> - <entry>--version</entry> - <entry>Show version information and exit.</entry> - </row> - <row> <entry></entry> <entry>[files ...]</entry> <entry>Open all given files at startup. This option causes &app; to Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2006-10-03 11:21:36 UTC (rev 862) +++ trunk/src/document.c 2006-10-03 13:16:42 UTC (rev 863) @@ -650,7 +650,13 @@ doc_list[idx].encoding = enc; doc_list[idx].has_bom = bom; - sci_goto_pos(doc_list[idx].sci, pos, TRUE); + if (cl_options.goto_line >= 0) + { // goto line which was specified on command line and then undefine the line + sci_goto_line_scroll(doc_list[idx].sci, cl_options.goto_line - 1, 0.25); + cl_options.goto_line = -1; + } + else if (pos >= 0) + sci_goto_pos(doc_list[idx].sci, pos, TRUE); if (! reload) { Modified: trunk/src/main.c =================================================================== --- trunk/src/main.c 2006-10-03 11:21:36 UTC (rev 862) +++ trunk/src/main.c 2006-10-03 13:16:42 UTC (rev 863) @@ -81,20 +81,21 @@ static GOptionEntry entries[] = { + { "config", 'c', 0, G_OPTION_ARG_FILENAME, &alternate_config, N_("use an alternate configuration directory"), NULL }, { "debug", 'd', 0, G_OPTION_ARG_NONE, &debug_mode, N_("runs in debug mode (means being verbose)"), NULL }, - { "no-session", 's', G_OPTION_FLAG_REVERSE, G_OPTION_ARG_NONE, &cl_options.load_session, N_("don't load the previous session's files"), NULL }, - { "no-ctags", 'n', 0, G_OPTION_ARG_NONE, &ignore_global_tags, N_("don't load auto completion data (see documentation)"), NULL }, + { "generate-data-files", 'g', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, &generate_datafiles, "", NULL }, #ifdef HAVE_SOCKET { "new-instance", 'i', 0, G_OPTION_ARG_NONE, &ignore_socket, N_("don't open files in a running instance, force opening a new instance"), NULL }, #endif - { "config", 'c', 0, G_OPTION_ARG_FILENAME, &alternate_config, N_("use an alternate configuration directory"), NULL }, + { "line", 'l', 0, G_OPTION_ARG_INT, &cl_options.goto_line, N_("set initial line number for the first opened file"), NULL }, { "no-msgwin", 'm', 0, G_OPTION_ARG_NONE, &no_msgwin, N_("don't show message window at startup"), NULL }, + { "no-ctags", 'n', 0, G_OPTION_ARG_NONE, &ignore_global_tags, N_("don't load auto completion data (see documentation)"), NULL }, + { "no-session", 's', G_OPTION_FLAG_REVERSE, G_OPTION_ARG_NONE, &cl_options.load_session, N_("don't load the previous session's files"), NULL }, #ifdef HAVE_VTE { "no-terminal", 't', 0, G_OPTION_ARG_NONE, &no_vte, N_("don't load terminal support"), NULL }, - { "vte-lib", 'l', 0, G_OPTION_ARG_FILENAME, &lib_vte, N_("filename of libvte.so"), NULL }, + { "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 }, - { "generate-data-files", 'g', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, &generate_datafiles, "", NULL }, { NULL, 0, 0, 0, NULL, NULL, NULL } }; @@ -384,6 +385,7 @@ // first initialise cl_options fields with default values cl_options.load_session = TRUE; + cl_options.goto_line = -1; context = g_option_context_new(_(" - A fast and lightweight IDE")); g_option_context_add_main_entries(context, entries, GETTEXT_PACKAGE); Modified: trunk/src/main.h =================================================================== --- trunk/src/main.h 2006-10-03 11:21:36 UTC (rev 862) +++ trunk/src/main.h 2006-10-03 13:16:42 UTC (rev 863) @@ -28,6 +28,7 @@ typedef struct { gboolean load_session; + gint goto_line; } CommandLineOptions; extern CommandLineOptions cl_options; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [862] trunk
by eht16＠users.sourceforge.net 03 Oct '06

03 Oct '06

Revision: 862 http://svn.sourceforge.net/geany/?rev=862&view=rev Author: eht16 Date: 2006-10-03 04:21:36 -0700 (Tue, 03 Oct 2006) Log Message: ----------- Save configuration(i.e. list of open files) as late as possible and save the filetype build commands first shortly before quitting. Modified Paths: -------------- trunk/ChangeLog trunk/src/callbacks.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-10-02 15:22:29 UTC (rev 861) +++ trunk/ChangeLog 2006-10-03 11:21:36 UTC (rev 862) @@ -1,3 +1,10 @@ +2006-10-03 Enrico Tröger <enrico.troeger(a)uvena.de> + + * src/callbacks.c: Save configuration(i.e. list of open files) as late + as possible and save the filetype build commands + first shortly before quitting. + + 2006-10-02 Nick Treleaven <nick.treleaven(a)btinternet.com> * src/templates.c: Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2006-10-02 15:22:29 UTC (rev 861) +++ trunk/src/callbacks.c 2006-10-03 11:21:36 UTC (rev 862) @@ -87,6 +87,7 @@ #endif keybindings_free(); + filetypes_save_commands(); filetypes_free_types(); styleset_free_styles(); templates_free_templates(); @@ -162,10 +163,6 @@ { app->quitting = TRUE; - // TODO: only save config if definitely quitting - configuration_save(); - filetypes_save_commands(); - if (gtk_notebook_get_n_pages(GTK_NOTEBOOK(app->notebook)) > 0) { gint i; @@ -181,21 +178,36 @@ } if (has_dirty_editors) { - if (on_close_all1_activate(NULL, NULL)) destroyapp(NULL, gdata); + // there is the chance that the user cancel the exit process while closing open + // files, so save the configuration(i.e. the list of open files) first + configuration_save(); + if (on_close_all1_activate(NULL, NULL)) + { + destroyapp(NULL, gdata); + } else app->quitting = FALSE; } else { if (app->pref_main_confirm_exit) { + // there is the chance that the user cancel the exit process while closing open + // files, so save the configuration(i.e. the list of open files) first + configuration_save(); if (dialogs_show_question_full(GTK_STOCK_QUIT, GTK_STOCK_CANCEL, NULL, _("Do you really want to quit?")) && on_close_all1_activate(NULL, NULL)) + { destroyapp(NULL, gdata); + } else app->quitting = FALSE; } else { - if (on_close_all1_activate(NULL, NULL)) destroyapp(NULL, gdata); + if (on_close_all1_activate(NULL, NULL)) + { + configuration_save(); + destroyapp(NULL, gdata); + } else app->quitting = FALSE; } } @@ -206,11 +218,15 @@ { if (dialogs_show_question_full(GTK_STOCK_QUIT, GTK_STOCK_CANCEL, NULL, _("Do you really want to quit?"))) - destroyapp(NULL, gdata); + { + configuration_save(); + destroyapp(NULL, gdata); + } else app->quitting = FALSE; } else { + configuration_save(); destroyapp(NULL, gdata); } } @@ -2258,7 +2274,7 @@ filetype *ft = user_data; g_return_if_fail(ft != NULL); - + if (response == GTK_RESPONSE_ACCEPT) { const gchar *newstr; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [861] trunk
by ntrel＠users.sourceforge.net 02 Oct '06

02 Oct '06

Revision: 861 http://svn.sourceforge.net/geany/?rev=861&view=rev Author: ntrel Date: 2006-10-02 08:22:29 -0700 (Mon, 02 Oct 2006) Log Message: ----------- Change sci_get_line to return a NULL terminated string. Fix memory leak and possible invalid read in sci_cb_auto_latex(). Modified Paths: -------------- trunk/ChangeLog trunk/src/callbacks.c trunk/src/document.c trunk/src/sci_cb.c trunk/src/sciwrappers.c trunk/src/sciwrappers.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-10-02 11:31:54 UTC (rev 860) +++ trunk/ChangeLog 2006-10-02 15:22:29 UTC (rev 861) @@ -6,6 +6,10 @@ src/makefile.win32, src/Makefile.am, po/POTFILES.in: Move global tags code to symbols.c. Added symbols_global_tags_loaded(), symbols_get_global_keywords(). + * src/callbacks.c, src/sci_cb.c, src/sciwrappers.c, src/sciwrappers.h, + src/document.c: + Change sci_get_line to return a NULL terminated string. + Fix memory leak and possible invalid read in sci_cb_auto_latex(). 2006-10-01 Enrico Tröger <enrico.troeger(a)uvena.de> Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2006-10-02 11:31:54 UTC (rev 860) +++ trunk/src/callbacks.c 2006-10-02 15:22:29 UTC (rev 861) @@ -1296,8 +1296,7 @@ if (pos == -1) break; line = sci_get_line_from_position(doc_list[i].sci, pos); - buffer = g_malloc0(sci_get_line_length(doc_list[i].sci, line) + 1); - sci_get_line(doc_list[i].sci, line, buffer); + buffer = sci_get_line(doc_list[i].sci, line); if (doc_list[i].file_name == NULL) short_file_name = g_strdup(GEANY_STRING_UNTITLED); Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2006-10-02 11:31:54 UTC (rev 860) +++ trunk/src/document.c 2006-10-02 15:22:29 UTC (rev 861) @@ -1335,13 +1335,10 @@ sci_get_line_length(doc_list[idx].sci, line) == utils_get_eol_char_len(idx)) return; + // don't set the indicator on whitespace len = end - start; - linebuf = g_malloc(len); + linebuf = sci_get_line(doc_list[idx].sci, line); - // don't set the indicator on whitespace - sci_get_line(doc_list[idx].sci, line, linebuf); - if (linebuf == NULL) return; - while (isspace(linebuf[i])) i++; while (isspace(linebuf[len-1])) len--; g_free(linebuf); Modified: trunk/src/sci_cb.c =================================================================== --- trunk/src/sci_cb.c 2006-10-02 11:31:54 UTC (rev 860) +++ trunk/src/sci_cb.c 2006-10-02 15:22:29 UTC (rev 861) @@ -330,9 +330,7 @@ if (! use_this_line) prev_line--; len = sci_get_line_length(sci, prev_line); - linebuf = g_malloc(len + 1); - sci_get_line(sci, prev_line, linebuf); - linebuf[len] = '\0'; + linebuf = sci_get_line(sci, prev_line); for (i = 0; i < len; i++) { @@ -438,8 +436,7 @@ utils_get_eol_char_len(document_find_by_sci(sci)); // check that the line is empty, to not kill text in the line - line_buf = g_malloc(line_len + 1); - sci_get_line(sci, line, line_buf); + line_buf = sci_get_line(sci, line); line_buf[line_len - eol_char_len] = '\0'; while (x < (line_len - eol_char_len)) { @@ -469,11 +466,10 @@ gint line_start = sci_get_position_from_line(sci, line); gint startword = pos - line_start; gint endword = pos - line_start; - gchar *chunk = g_malloc(sci_get_line_length(sci, line) + 1); + gchar *chunk; word[0] = '\0'; - sci_get_line(sci, line, chunk); - chunk[sci_get_line_length(sci, line)] = '\0'; + chunk = sci_get_line(sci, line); while (startword > 0 && strchr(GEANY_WORDCHARS, chunk[startword - 1])) startword--; @@ -664,8 +660,7 @@ else if (lexer == SCLEX_RUBY && style == SCE_MAKE_COMMENT) return FALSE; - linebuf = g_malloc(line_len + 1); - sci_get_line(sci, line, linebuf); + linebuf = sci_get_line(sci, line); // find the start of the current word while ((startword > 0) && (strchr(GEANY_WORDCHARS, linebuf[startword - 1]))) @@ -706,8 +701,7 @@ gint i, start; // get the line - buf = g_malloc0(line_len + 1); - sci_get_line(sci, line, buf); + buf = sci_get_line(sci, line); // get to the first non-blank char (some kind of ltrim()) start = 0; @@ -722,7 +716,7 @@ // take also "\begingroup" (or whatever there can be) and append "\endgroup" and so on. i = start + 6; - while (buf[i] != '{' && j < (sizeof(full_cmd) - 1)) + while (i < line_len && buf[i] != '{' && j < (sizeof(full_cmd) - 1)) { // copy all between "\begin" and "{" to full_cmd full_cmd[j] = buf[i]; i++; @@ -757,13 +751,11 @@ SSM(sci, SCI_INSERTTEXT, pos, (sptr_t) construct); sci_goto_pos(sci, pos + 1, TRUE); g_free(construct); - g_free(buf); g_free(eol); } - else - { // later there could be some else ifs for other keywords - return; - } + // later there could be some else ifs for other keywords + + g_free(buf); } } @@ -1107,9 +1099,7 @@ // check whether the line is empty and can be deleted line = sci_get_line_from_position(doc_list[idx].sci, pos); len = sci_get_line_length(doc_list[idx].sci, line); - linebuf = g_malloc(len + 1); - sci_get_line(doc_list[idx].sci, line, linebuf); - linebuf[len] = '\0'; + linebuf = sci_get_line(doc_list[idx].sci, line); x = 0; while (linebuf[x] != '\0' && isspace(linebuf[x])) x++; if (x == len) SSM(doc_list[idx].sci, SCI_LINEDELETE, 0, 0); @@ -1122,9 +1112,7 @@ // check whether the line is empty and can be deleted line = sci_get_line_from_position(doc_list[idx].sci, pos); len = sci_get_line_length(doc_list[idx].sci, line); - linebuf = g_malloc(len + 1); - sci_get_line(doc_list[idx].sci, line, linebuf); - linebuf[len] = '\0'; + linebuf = sci_get_line(doc_list[idx].sci, line); x = 0; while (linebuf[x] != '\0' && isspace(linebuf[x])) x++; if (x == len) SSM(doc_list[idx].sci, SCI_LINEDELETE, 0, 0); Modified: trunk/src/sciwrappers.c =================================================================== --- trunk/src/sciwrappers.c 2006-10-02 11:31:54 UTC (rev 860) +++ trunk/src/sciwrappers.c 2006-10-02 15:22:29 UTC (rev 861) @@ -469,11 +469,18 @@ } -void sci_get_line(ScintillaObject* sci, gint line, gchar* text) +// Returns: a NULL-terminated copy of the line text +gchar *sci_get_line(ScintillaObject* sci, gint line_num) { - SSM(sci,SCI_GETLINE, line, (sptr_t) text); + gint len = sci_get_line_length(sci, line_num); + gchar *linebuf = g_malloc(len + 1); + + SSM(sci, SCI_GETLINE, line_num, (sptr_t) linebuf); + linebuf[len] = '\0'; + return linebuf; } + // the last char will be null terminated void sci_get_text(ScintillaObject* sci, gint len, gchar* text) { Modified: trunk/src/sciwrappers.h =================================================================== --- trunk/src/sciwrappers.h 2006-10-02 11:31:54 UTC (rev 860) +++ trunk/src/sciwrappers.h 2006-10-02 15:22:29 UTC (rev 861) @@ -81,7 +81,7 @@ void sci_get_text (ScintillaObject* sci,gint len,gchar* text); void sci_get_selected_text (ScintillaObject* sci, gchar* text); gint sci_get_selected_text_length(ScintillaObject* sci); -void sci_get_line (ScintillaObject* sci, gint line, gchar* text); +gchar * sci_get_line (ScintillaObject* sci, gint line_num); gint sci_get_line_length (ScintillaObject* sci, gint line); gint sci_get_line_count ( ScintillaObject* sci ); void sci_get_xy_from_position (ScintillaObject* sci,gint pos, gint* x, gint* y); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [860] trunk
by ntrel＠users.sourceforge.net 02 Oct '06

02 Oct '06

Revision: 860 http://svn.sourceforge.net/geany/?rev=860&view=rev Author: ntrel Date: 2006-10-02 04:31:54 -0700 (Mon, 02 Oct 2006) Log Message: ----------- Move global tags code to symbols.c. Added symbols_global_tags_loaded(), symbols_get_global_keywords(). Modified Paths: -------------- trunk/ChangeLog trunk/po/POTFILES.in trunk/src/Makefile.am trunk/src/highlighting.c trunk/src/makefile.win32 Added Paths: ----------- trunk/src/symbols.c trunk/src/symbols.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-10-02 11:14:36 UTC (rev 859) +++ trunk/ChangeLog 2006-10-02 11:31:54 UTC (rev 860) @@ -2,6 +2,10 @@ * src/templates.c: Added a blank line indent for templates D, HTML, PHP. + * src/symbols.c, src/symbols.h, src/highlighting.c, + src/makefile.win32, src/Makefile.am, po/POTFILES.in: + Move global tags code to symbols.c. + Added symbols_global_tags_loaded(), symbols_get_global_keywords(). 2006-10-01 Enrico Tröger <enrico.troeger(a)uvena.de> Modified: trunk/po/POTFILES.in =================================================================== --- trunk/po/POTFILES.in 2006-10-02 11:14:36 UTC (rev 859) +++ trunk/po/POTFILES.in 2006-10-02 11:31:54 UTC (rev 860) @@ -27,3 +27,4 @@ src/keybindings.c src/search.c src/notebook.c +src/symbols.c Modified: trunk/src/Makefile.am =================================================================== --- trunk/src/Makefile.am 2006-10-02 11:14:36 UTC (rev 859) +++ trunk/src/Makefile.am 2006-10-02 11:31:54 UTC (rev 860) @@ -8,6 +8,7 @@ SRCS = \ main.c main.h geany.h \ + symbols.c symbols.h \ search.c search.h \ notebook.c notebook.h \ keybindings.c keybindings.h \ Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2006-10-02 11:14:36 UTC (rev 859) +++ trunk/src/highlighting.c 2006-10-02 11:31:54 UTC (rev 860) @@ -29,6 +29,7 @@ #include "utils.h" #include "main.h" #include "filetypes.h" +#include "symbols.h" typedef struct @@ -81,42 +82,6 @@ } common_style_set; -enum // Geany tag files -{ - GTF_C, - GTF_PASCAL, - GTF_PHP, - GTF_HTML_ENTITIES, - GTF_LATEX, - GTF_MAX -}; - -// langType used in TagManager (see the table in tagmanager/parsers.h) -enum // Geany lang type -{ - GLT_C = 0, - GLT_CPP = 1, - GLT_PASCAL = 4, - GLT_PHP = 6, - GLT_LATEX = 8 -}; - -typedef struct -{ - gboolean tags_loaded; - const gchar *tag_file; -} TagFileInfo; - -static TagFileInfo tag_file_info[GTF_MAX] = -{ - {FALSE, "global.tags"}, - {FALSE, "pascal.tags"}, - {FALSE, "php.tags"}, - {FALSE, "html_entities.tags"}, - {FALSE, "latex.tags"} -}; - - static void new_style_array(gint file_type_id, gint styling_count) { style_sets[file_type_id].styling = g_new0(Style, styling_count); @@ -131,41 +96,6 @@ #endif -// lang_type is for langType used in TagManager (see the table in tagmanager/parsers.h) -static void ensure_tags_loaded(gint tag_file_index, gint lang_type) -{ - TagFileInfo *tfi; - - if (app->ignore_global_tags) return; - - tfi = &tag_file_info[tag_file_index]; - if (! tfi->tags_loaded) - { - gchar *file = g_strconcat(app->datadir, G_DIR_SEPARATOR_S, tfi->tag_file, NULL); - tm_workspace_load_global_tags(file, lang_type); - tfi->tags_loaded = TRUE; - g_free(file); - } -} - - -static void ensure_html_tags_loaded() -{ - TagFileInfo *tfi; - - if (app->ignore_global_tags) return; - - tfi = &tag_file_info[GTF_HTML_ENTITIES]; - if (! tfi->tags_loaded) - { - gchar *file = g_strconcat(app->datadir, G_DIR_SEPARATOR_S, tfi->tag_file, NULL); - html_entities = utils_read_file_in_array(file); - tfi->tags_loaded = TRUE; - g_free(file); - } -} - - /* simple wrapper function to print file errors in DEBUG mode */ static void load_system_keyfile(GKeyFile *key_file, const gchar *file, GKeyFileFlags flags, G_GNUC_UNUSED GError **just_for_compatibility) @@ -581,35 +511,23 @@ g_key_file_free(config_home); // load global tags file for C autocompletion - ensure_tags_loaded(GTF_C, GLT_C); + symbols_global_tags_loaded(GEANY_FILETYPES_C); } void styleset_c(ScintillaObject *sci) { + GString *s; + styleset_common(sci, 5); if (style_sets[GEANY_FILETYPES_C].styling == NULL) styleset_c_init(); /* Assign global keywords */ - if ((app->tm_workspace) && (app->tm_workspace->global_tags)) + s = symbols_get_global_keywords(); + if (s != NULL) { - guint j; - GPtrArray *g_typedefs = tm_tags_extract(app->tm_workspace->global_tags, tm_tag_typedef_t | tm_tag_struct_t | tm_tag_class_t); - if ((g_typedefs) && (g_typedefs->len > 0)) - { - GString *s = g_string_sized_new(g_typedefs->len * 10); - for (j = 0; j < g_typedefs->len; ++j) - { - if (!(TM_TAG(g_typedefs->pdata[j])->atts.entry.scope)) - { - g_string_append(s, TM_TAG(g_typedefs->pdata[j])->name); - g_string_append_c(s, ' '); - } - } - SSM(sci, SCI_SETKEYWORDS, 1, (sptr_t) s->str); - g_string_free(s, TRUE); - } - g_ptr_array_free(g_typedefs, TRUE); + SSM(sci, SCI_SETKEYWORDS, 1, (sptr_t) s->str); + g_string_free(s, TRUE); } SSM(sci, SCI_SETWORDCHARS, 0, (sptr_t) style_sets[GEANY_FILETYPES_C].wordchars); @@ -702,35 +620,23 @@ g_key_file_free(config_home); // load global tags file for C autocompletion - ensure_tags_loaded(GTF_C, GLT_CPP); + symbols_global_tags_loaded(GEANY_FILETYPES_CPP); } void styleset_cpp(ScintillaObject *sci) { + GString *s; + styleset_common(sci, 5); if (style_sets[GEANY_FILETYPES_CPP].styling == NULL) styleset_cpp_init(); /* Assign global keywords */ - if ((app->tm_workspace) && (app->tm_workspace->global_tags)) + s = symbols_get_global_keywords(); + if (s != NULL) { - guint j; - GPtrArray *g_typedefs = tm_tags_extract(app->tm_workspace->global_tags, tm_tag_typedef_t | tm_tag_struct_t | tm_tag_class_t); - if ((g_typedefs) && (g_typedefs->len > 0)) - { - GString *s = g_string_sized_new(g_typedefs->len * 10); - for (j = 0; j < g_typedefs->len; ++j) - { - if (!(TM_TAG(g_typedefs->pdata[j])->atts.entry.scope)) - { - g_string_append(s, TM_TAG(g_typedefs->pdata[j])->name); - g_string_append_c(s, ' '); - } - } - SSM(sci, SCI_SETKEYWORDS, 1, (sptr_t) s->str); - g_string_free(s, TRUE); - } - g_ptr_array_free(g_typedefs, TRUE); + SSM(sci, SCI_SETKEYWORDS, 1, (sptr_t) s->str); + g_string_free(s, TRUE); } SSM(sci, SCI_SETWORDCHARS, 0, (sptr_t) style_sets[GEANY_FILETYPES_CPP].wordchars); @@ -811,7 +717,7 @@ filetypes_get_config(config, config_home, GEANY_FILETYPES_PASCAL); // load global tags file for PASCAL autocompletion - ensure_tags_loaded(GTF_PASCAL, GLT_PASCAL); + symbols_global_tags_loaded(GEANY_FILETYPES_PASCAL); g_key_file_free(config); g_key_file_free(config_home); @@ -964,7 +870,7 @@ filetypes_get_config(config, config_home, GEANY_FILETYPES_LATEX); // load global tags file for LaTeX autocompletion - ensure_tags_loaded(GTF_LATEX, GLT_LATEX); + symbols_global_tags_loaded(GEANY_FILETYPES_LATEX); g_key_file_free(config); g_key_file_free(config_home); @@ -1005,7 +911,7 @@ filetypes_get_config(config, config_home, GEANY_FILETYPES_PHP); // load global tags file for PHP autocompletion - ensure_tags_loaded(GTF_PHP, GLT_PHP); + symbols_global_tags_loaded(GEANY_FILETYPES_PHP); g_key_file_free(config); g_key_file_free(config_home); @@ -1045,7 +951,7 @@ filetypes_get_config(config, config_home, GEANY_FILETYPES_HTML); // load global tags file for HTML entities autocompletion - ensure_html_tags_loaded(); + symbols_global_tags_loaded(GEANY_FILETYPES_HTML); g_key_file_free(config); g_key_file_free(config_home); @@ -2591,35 +2497,23 @@ // load global tags file for C autocompletion // C++ is a special case, here we use 0 to have C global tags in C++, too - ensure_tags_loaded(GTF_C, GLT_C); + symbols_global_tags_loaded(GEANY_FILETYPES_C); } void styleset_d(ScintillaObject *sci) { + GString *s; + styleset_common(sci, 5); if (style_sets[GEANY_FILETYPES_D].styling == NULL) styleset_d_init(); /* Assign global keywords */ - if ((app->tm_workspace) && (app->tm_workspace->global_tags)) + s = symbols_get_global_keywords(); + if (s != NULL) { - guint j; - GPtrArray *g_typedefs = tm_tags_extract(app->tm_workspace->global_tags, tm_tag_typedef_t | tm_tag_struct_t | tm_tag_class_t); - if ((g_typedefs) && (g_typedefs->len > 0)) - { - GString *s = g_string_sized_new(g_typedefs->len * 10); - for (j = 0; j < g_typedefs->len; ++j) - { - if (!(TM_TAG(g_typedefs->pdata[j])->atts.entry.scope)) - { - g_string_append(s, TM_TAG(g_typedefs->pdata[j])->name); - g_string_append_c(s, ' '); - } - } - SSM(sci, SCI_SETKEYWORDS, 1, (sptr_t) s->str); - g_string_free(s, TRUE); - } - g_ptr_array_free(g_typedefs, TRUE); + SSM(sci, SCI_SETKEYWORDS, 1, (sptr_t) s->str); + g_string_free(s, TRUE); } SSM(sci, SCI_SETWORDCHARS, 0, (sptr_t) style_sets[GEANY_FILETYPES_D].wordchars); Modified: trunk/src/makefile.win32 =================================================================== --- trunk/src/makefile.win32 2006-10-02 11:14:36 UTC (rev 859) +++ trunk/src/makefile.win32 2006-10-02 11:31:54 UTC (rev 860) @@ -46,7 +46,8 @@ OBJS = treeviews.o templates.o encodings.o about.o prefs.o win32.o build.o msgwindow.o dialogs.o \ filetypes.o interface.o main.o support.o callbacks.o utils.o ui_utils.o socket.o \ - highlighting.o sci_cb.o document.o sciwrappers.o keyfile.o keybindings.o search.o notebook.o + highlighting.o sci_cb.o document.o sciwrappers.o keyfile.o keybindings.o search.o notebook.o \ + symbols.o .c.o: $(CC) $(CCFLAGS) -c $< Added: trunk/src/symbols.c =================================================================== --- trunk/src/symbols.c (rev 0) +++ trunk/src/symbols.c 2006-10-02 11:31:54 UTC (rev 860) @@ -0,0 +1,145 @@ +/* + * symbols.c - this file is part of Geany, a fast and lightweight IDE + * + * Copyright 2006 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2006 Nick Treleaven <nick.treleaven(a)btinternet.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$ + */ + +#include "geany.h" +#include "symbols.h" +#include "utils.h" +#include "filetypes.h" +#include "sci_cb.h" // html_entities + + +enum // Geany tag files +{ + GTF_C, + GTF_PASCAL, + GTF_PHP, + GTF_HTML_ENTITIES, + GTF_LATEX, + GTF_MAX +}; + +typedef struct +{ + gboolean tags_loaded; + const gchar *tag_file; +} TagFileInfo; + +static TagFileInfo tag_file_info[GTF_MAX] = +{ + {FALSE, "global.tags"}, + {FALSE, "pascal.tags"}, + {FALSE, "php.tags"}, + {FALSE, "html_entities.tags"}, + {FALSE, "latex.tags"} +}; + +// langType used in TagManager (see tagmanager/parsers.h) +enum // Geany lang type +{ + GLT_C = 0, + GLT_CPP = 1, + GLT_PASCAL = 4, + GLT_PHP = 6, + GLT_LATEX = 8 +}; + + +static void html_tags_loaded(); + + +// Ensure that the global tags file for the file_type_idx filetype is loaded. +void symbols_global_tags_loaded(gint file_type_idx) +{ + TagFileInfo *tfi; + gint gtf, lt; + + if (app->ignore_global_tags) return; + + switch (file_type_idx) + { + case GEANY_FILETYPES_HTML: + html_tags_loaded(); + return; + case GEANY_FILETYPES_C: gtf = GTF_C; lt = GLT_C; break; + case GEANY_FILETYPES_CPP: gtf = GTF_C; lt = GLT_CPP; break; + case GEANY_FILETYPES_PASCAL:gtf = GTF_PASCAL; lt = GLT_PASCAL; break; + case GEANY_FILETYPES_PHP: gtf = GTF_PHP; lt = GLT_PHP; break; + case GEANY_FILETYPES_LATEX: gtf = GTF_LATEX; lt = GLT_LATEX; break; + default: + return; + } + tfi = &tag_file_info[gtf]; + + if (! tfi->tags_loaded) + { + gchar *file = g_strconcat(app->datadir, G_DIR_SEPARATOR_S, tfi->tag_file, NULL); + tm_workspace_load_global_tags(file, lt); + tfi->tags_loaded = TRUE; + g_free(file); + } +} + + +static void html_tags_loaded() +{ + TagFileInfo *tfi; + + if (app->ignore_global_tags) return; + + tfi = &tag_file_info[GTF_HTML_ENTITIES]; + if (! tfi->tags_loaded) + { + gchar *file = g_strconcat(app->datadir, G_DIR_SEPARATOR_S, tfi->tag_file, NULL); + html_entities = utils_read_file_in_array(file); + tfi->tags_loaded = TRUE; + g_free(file); + } +} + + +GString *symbols_get_global_keywords() +{ + GString *s = NULL; + + if ((app->tm_workspace) && (app->tm_workspace->global_tags)) + { + guint j; + GPtrArray *g_typedefs = tm_tags_extract(app->tm_workspace->global_tags, + tm_tag_typedef_t | tm_tag_struct_t | tm_tag_class_t); + + if ((g_typedefs) && (g_typedefs->len > 0)) + { + s = g_string_sized_new(g_typedefs->len * 10); + for (j = 0; j < g_typedefs->len; ++j) + { + if (!(TM_TAG(g_typedefs->pdata[j])->atts.entry.scope)) + { + g_string_append(s, TM_TAG(g_typedefs->pdata[j])->name); + g_string_append_c(s, ' '); + } + } + } + g_ptr_array_free(g_typedefs, TRUE); + } + return s; +} Property changes on: trunk/src/symbols.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Added: trunk/src/symbols.h =================================================================== --- trunk/src/symbols.h (rev 0) +++ trunk/src/symbols.h 2006-10-02 11:31:54 UTC (rev 860) @@ -0,0 +1,32 @@ +/* + * symbols.h - this file is part of Geany, a fast and lightweight IDE + * + * Copyright 2006 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2006 Nick Treleaven <nick.treleaven(a)btinternet.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$ + */ + + +#ifndef GEANY_SYMBOLS_H +#define GEANY_SYMBOLS_H 1 + +void symbols_global_tags_loaded(gint file_type_idx); + +GString *symbols_get_global_keywords(); + +#endif Property changes on: trunk/src/symbols.h ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits October 2006