Commits October 2006

commits@lists.geany.org

2 participants
93 discussions

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

10 Oct '06

Revision: 879 http://svn.sourceforge.net/geany/?rev=879&view=rev Author: eht16 Date: 2006-10-10 09:27:31 -0700 (Tue, 10 Oct 2006) Log Message: ----------- Got rid of goto usage and added auto completion for monitor construct for filetype Ferite. Modified Paths: -------------- trunk/ChangeLog trunk/src/sci_cb.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-10-10 16:02:41 UTC (rev 878) +++ trunk/ChangeLog 2006-10-10 16:27:31 UTC (rev 879) @@ -8,6 +8,8 @@ * src/document.c, src/sci_cb.c, src/callbacks.c: Finished new Undo system. Now some more actions can be undone and also redone. + * src/sci_cb.c: Got rid of goto usage and added auto completion for + monitor construct for filetype Ferite. 2006-10-09 Nick Treleaven <nick.treleaven(a)btinternet.com> Modified: trunk/src/sci_cb.c =================================================================== --- trunk/src/sci_cb.c 2006-10-10 16:02:41 UTC (rev 878) +++ trunk/src/sci_cb.c 2006-10-10 16:27:31 UTC (rev 879) @@ -757,11 +757,13 @@ gchar *construct; gint lexer, style; gint i; + gint last_pos; ScintillaObject *sci; if (idx == -1 || ! doc_list[idx].is_valid || doc_list[idx].file_type == NULL) return; sci = doc_list[idx].sci; + last_pos = sci_get_length(sci); lexer = SSM(sci, SCI_GETLEXER, 0, 0); style = SSM(sci, SCI_GETSTYLEAT, pos - 2, 0); @@ -799,16 +801,24 @@ // check the first 8 characters of buf for whitespace, but only in this line i = 14; while (isalpha(buf[i])) i--; // find pos before keyword - while (i >= 0 && buf[i] != '\n' && buf[i] != '\r') // we want to keep in this line('\n' check) + while (i >= 0 && buf[i] != '\n' && buf[i] != '\r') // we want to stay in this line('\n' check) { - if (! isspace(buf[i])) goto free_and_return; + if (! isspace(buf[i])) + { + g_free(eol); + return; + } i--; } // "pattern", buf + x, y -> x + y = 15, because buf is (pos - 16)...(pos - 1) = 15 if (! strncmp("if", buf + 13, 2)) { - if (! isspace(*(buf + 12))) goto free_and_return; + if (! isspace(*(buf + 12))) + { + g_free(eol); + return; + } construct = g_strdup_printf("()%s{%s\t%s}%s", eol, eol, eol, eol); @@ -818,7 +828,11 @@ } else if (! strncmp("else", buf + 11, 4)) { - if (! isspace(*(buf + 10))) goto free_and_return; + if (! isspace(*(buf + 10))) + { + g_free(eol); + return; + } construct = g_strdup_printf("%s{%s\t%s}%s", eol, eol, eol, eol); @@ -831,7 +845,11 @@ gchar *var; gint contruct_len; - if (! isspace(*(buf + 11))) goto free_and_return; + if (! isspace(*(buf + 11))) + { + g_free(eol); + return; + } if (doc_list[idx].file_type->id == GEANY_FILETYPES_PHP) { @@ -857,7 +875,11 @@ } else if (! strncmp("while", buf + 10, 5)) { - if (! isspace(*(buf + 9))) goto free_and_return; + if (! isspace(*(buf + 9))) + { + g_free(eol); + return; + } construct = g_strdup_printf("()%s{%s\t%s}%s", eol, eol, eol, eol); @@ -867,7 +889,11 @@ } else if (! strncmp("do", buf + 13, 2)) { - if (! isspace(*(buf + 12))) goto free_and_return; + if (! isspace(*(buf + 12))) + { + g_free(eol); + return; + } construct = g_strdup_printf("%s{%s\t%s}%swhile ();%s", eol, eol, eol, eol, eol); @@ -877,7 +903,11 @@ } else if (! strncmp("try", buf + 12, 3)) { - if (! isspace(*(buf + 11))) goto free_and_return; + if (! isspace(*(buf + 11))) + { + g_free(eol); + return; + } construct = g_strdup_printf("%s{%s\t%s}%scatch ()%s{%s\t%s}%s", eol, eol, eol, eol, eol, eol, eol, eol); @@ -888,7 +918,11 @@ } else if (! strncmp("switch", buf + 9, 6)) { - if (! isspace(*(buf + 8))) goto free_and_return; + if (! isspace(*(buf + 8))) + { + g_free(eol); + return; + } construct = g_strdup_printf("()%s{%s\tcase : break;%s\tdefault: %s}%s", eol, eol, eol, eol, eol); @@ -896,10 +930,14 @@ sci_goto_pos(sci, pos + 1, TRUE); g_free(construct); } - else if (! strncmp("iferr", buf + 10, 5)) + else if (doc_list[idx].file_type->id == GEANY_FILETYPES_FERITE && ! strncmp("iferr", buf + 10, 5)) { if (doc_list[idx].file_type->id != GEANY_FILETYPES_FERITE || - ! isspace(*(buf + 9))) goto free_and_return; + ! isspace(*(buf + 9))) + { + g_free(eol); + return; + } construct = g_strdup_printf("%s{%s\t%s}%sfix%s{%s\t%s}%s", eol, eol, eol, eol, eol, eol, eol, eol); @@ -907,9 +945,20 @@ sci_goto_pos(sci, pos + 4 + (2 * strlen(indent)), TRUE); g_free(construct); } + else if (doc_list[idx].file_type->id == GEANY_FILETYPES_FERITE && ! strncmp("monitor", buf + 8, 7)) + { + if (! isspace(*(buf + 7))) + { + g_free(eol); + return; + } - free_and_return: - g_free(eol); + construct = g_strdup_printf("%s{%s\t%s}%shandle%s{%s\t%s}%s", eol, eol, eol, eol, eol, eol, eol, eol); + + SSM(sci, SCI_INSERTTEXT, pos, (sptr_t) construct); + sci_goto_pos(sci, pos + 4 + (2 * strlen(indent)), TRUE); + g_free(construct); + } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

10 Oct '06

Revision: 878 http://svn.sourceforge.net/geany/?rev=878&view=rev Author: eht16 Date: 2006-10-10 09:02:41 -0700 (Tue, 10 Oct 2006) Log Message: ----------- Finished new Undo system. Now some more actions can be undone and also redone. Modified Paths: -------------- trunk/ChangeLog trunk/src/callbacks.c trunk/src/document.c trunk/src/document.h trunk/src/sci_cb.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-10-10 14:27:58 UTC (rev 877) +++ trunk/ChangeLog 2006-10-10 16:02:41 UTC (rev 878) @@ -1,6 +1,13 @@ 2006-10-10 Enrico Tröger <enrico.troeger(a)uvena.de> * src/document.c: Connect only once to the "sci-notify" signal. + * scintilla/CellBuffer.cxx, scintilla/Document.cxx, + scintilla/include/Scintilla.h: + Applied patch from Armel Asselin (thanks). It adds SC_START_ACTION + notification which is required for Geany's new Undo system. + * src/document.c, src/sci_cb.c, src/callbacks.c: + Finished new Undo system. Now some more actions can be undone and + also redone. 2006-10-09 Nick Treleaven <nick.treleaven(a)btinternet.com> Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2006-10-10 14:27:58 UTC (rev 877) +++ trunk/src/callbacks.c 2006-10-10 16:02:41 UTC (rev 878) @@ -2432,15 +2432,12 @@ gint idx = document_get_cur_idx(); guint i = GPOINTER_TO_INT(user_data); - if (app->ignore_callback || idx < 0 || encodings[i].charset == NULL || + if (app->ignore_callback || ! DOC_IDX_VALID(idx) || encodings[i].charset == NULL || utils_strcmp(encodings[i].charset, doc_list[idx].encoding)) return; - // old charset string will be freed with the undo buffer - document_undo_add(idx, UNDO_ENCODING, doc_list[idx].encoding); - doc_list[idx].encoding = g_strdup(encodings[i].charset); - ui_update_statusbar(idx, -1); - gtk_widget_set_sensitive(lookup_widget(app->window, "menu_write_unicode_bom1"), - utils_is_unicode_charset(doc_list[idx].encoding)); + document_undo_add(idx, UNDO_ENCODING, g_strdup(doc_list[idx].encoding)); + + document_set_encoding(idx, encodings[i].charset); } @@ -2492,9 +2489,10 @@ if (idx == -1 || ! doc_list[idx].is_valid) return; + document_undo_add(idx, UNDO_BOM, GINT_TO_POINTER(doc_list[idx].has_bom)); + doc_list[idx].has_bom = ! doc_list[idx].has_bom; - document_undo_add(idx, UNDO_BOM, GINT_TO_POINTER(! doc_list[idx].has_bom)); ui_update_statusbar(idx, -1); } } Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2006-10-10 14:27:58 UTC (rev 877) +++ trunk/src/document.c 2006-10-10 16:02:41 UTC (rev 878) @@ -68,7 +68,11 @@ document_replace_range(gint idx, const gchar *find_text, const gchar *replace_text, gint flags, gint start, gint end, gboolean escaped_chars); +static void document_undo_clear(gint idx); +static void document_redo_add(gint idx, guint type, gpointer data); + + /* returns the index of the notebook page 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. */ @@ -362,7 +366,6 @@ doc_list[idx].has_bom = FALSE; doc_list[idx].tm_file = NULL; document_undo_clear(idx); - document_redo_clear(idx); if (gtk_notebook_get_n_pages(GTK_NOTEBOOK(app->notebook)) == 0) { ui_update_tag_list(-1, FALSE); @@ -388,10 +391,19 @@ g_assert(idx != -1); + sci_set_undo_collection(doc_list[idx].sci, FALSE); // avoid creation of an undo action sci_clear_all(doc_list[idx].sci); sci_set_text(doc_list[idx].sci, template); g_free(template); +#ifdef G_OS_WIN32 + sci_set_eol_mode(doc_list[idx].sci, SC_EOL_CRLF); +#else + sci_set_eol_mode(doc_list[idx].sci, SC_EOL_LF); +#endif + sci_set_undo_collection(doc_list[idx].sci, TRUE); + sci_empty_undo_buffer(doc_list[idx].sci); + doc_list[idx].encoding = g_strdup(encodings[app->pref_editor_default_encoding].charset); //document_set_filetype(idx, (ft == NULL) ? filetypes[GEANY_FILETYPES_ALL] : ft); document_set_filetype(idx, ft); // also clears taglist @@ -402,13 +414,8 @@ doc_list[idx].changed = FALSE; document_set_text_changed(idx); ui_document_show_hide(idx); //update the document menu -#ifdef G_OS_WIN32 - sci_set_eol_mode(doc_list[idx].sci, SC_EOL_CRLF); -#else - sci_set_eol_mode(doc_list[idx].sci, SC_EOL_LF); -#endif + sci_set_line_numbers(doc_list[idx].sci, app->show_linenumber_margin, 0); - sci_empty_undo_buffer(doc_list[idx].sci); sci_goto_pos(doc_list[idx].sci, 0, TRUE); // "the" SCI signal (connect after initial setup(i.e. adding text)) @@ -637,15 +644,17 @@ if (idx == -1) return -1; // really should not happen // set editor mode and add the text to the ScintillaObject - sci_set_text(doc_list[idx].sci, data); // NULL terminated data; avoids modifying sci + sci_set_undo_collection(doc_list[idx].sci, FALSE); // avoid creation of an undo action + sci_empty_undo_buffer(doc_list[idx].sci); + sci_set_text(doc_list[idx].sci, data); // NULL terminated data + editor_mode = utils_get_line_endings(data, size); sci_set_eol_mode(doc_list[idx].sci, editor_mode); + sci_set_line_numbers(doc_list[idx].sci, app->show_linenumber_margin, 0); - sci_set_line_numbers(doc_list[idx].sci, app->show_linenumber_margin, 0); - sci_set_savepoint(doc_list[idx].sci); - sci_empty_undo_buffer(doc_list[idx].sci); - // get the modification time from file and keep it - doc_list[idx].mtime = st.st_mtime; + sci_set_undo_collection(doc_list[idx].sci, TRUE); + + doc_list[idx].mtime = st.st_mtime; // get the modification time from file and keep it doc_list[idx].changed = FALSE; doc_list[idx].file_name = g_strdup(utf8_filename); doc_list[idx].encoding = enc; @@ -676,6 +685,7 @@ else { // reloading document_update_tag_list(idx, TRUE); + document_undo_clear(idx); } document_set_text_changed(idx); @@ -1494,11 +1504,26 @@ } } + +void document_set_encoding(gint idx, const gchar *new_encoding) +{ + if (! DOC_IDX_VALID(idx) || new_encoding == NULL || + utils_strcmp(new_encoding, doc_list[idx].encoding)) return; + + g_free(doc_list[idx].encoding); + doc_list[idx].encoding = g_strdup(new_encoding); + + ui_update_statusbar(idx, -1); + gtk_widget_set_sensitive(lookup_widget(app->window, "menu_write_unicode_bom1"), + utils_is_unicode_charset(doc_list[idx].encoding)); +} + + /* own Undo / Redo implementation to be able to undo / redo changes * to the encoding or the Unicode BOM (which are Scintilla independet). * All Scintilla events are stored in the undo / redo buffer and are passed through. */ -/* Clears the Undo buffer (to be called after saving a file or when closing the document) */ +/* Clears the Undo and Redo buffer (to be called when reloading or closing the document) */ void document_undo_clear(gint idx) { undo_action *a; @@ -1519,17 +1544,6 @@ } doc_list[idx].undo_actions = NULL; - doc_list[idx].changed = FALSE; - if (! app->quitting) document_set_text_changed(idx); -} - - -/* Clears the Redo buffer (to be called after saving a file or when closing the document) */ -void document_redo_clear(gint idx) -{ -/* - undo_action *a; - while (g_trash_stack_height(&doc_list[idx].redo_actions) > 0) { a = g_trash_stack_pop(&doc_list[idx].redo_actions); @@ -1548,7 +1562,9 @@ doc_list[idx].changed = FALSE; if (! app->quitting) document_set_text_changed(idx); -*/ + + //geany_debug("%s: new undo stack height: %d, new redo stack height: %d", __func__, + //g_trash_stack_height(&doc_list[idx].undo_actions), g_trash_stack_height(&doc_list[idx].redo_actions)); } @@ -1556,7 +1572,7 @@ { undo_action *action; - if (idx == -1 || ! doc_list[idx].is_valid) return; + if (! DOC_IDX_VALID(idx)) return; action = g_new0(undo_action, 1); action->type = type; @@ -1568,19 +1584,15 @@ document_set_text_changed(idx); ui_update_popup_reundo_items(idx); - { - geany_debug("%s: new stack height: %d, added type: %d", __func__, - g_trash_stack_height(&doc_list[idx].undo_actions), action->type); - } + //geany_debug("%s: new stack height: %d, added type: %d", __func__, + //g_trash_stack_height(&doc_list[idx].undo_actions), action->type); } gboolean document_can_undo(gint idx) { - return sci_can_undo(doc_list[idx].sci); + if (! DOC_IDX_VALID(idx)) return FALSE; - if (idx == -1 || ! doc_list[idx].is_valid) return FALSE; - if (g_trash_stack_height(&doc_list[idx].undo_actions) > 0 || sci_can_undo(doc_list[idx].sci)) return TRUE; else @@ -1588,31 +1600,96 @@ } +void document_undo(gint idx) +{ + undo_action *action; + + if (! DOC_IDX_VALID(idx)) return; + + action = g_trash_stack_pop(&doc_list[idx].undo_actions); + + if (action == NULL) + { + // fallback, should not be necessary + geany_debug("%s: fallback used", __func__); + sci_undo(doc_list[idx].sci); + } + else + { + switch (action->type) + { + case UNDO_SCINTILLA: + { + document_redo_add(idx, UNDO_SCINTILLA, NULL); + + sci_undo(doc_list[idx].sci); + break; + } + case UNDO_BOM: + { + document_redo_add(idx, UNDO_BOM, GINT_TO_POINTER(doc_list[idx].has_bom)); + + doc_list[idx].has_bom = GPOINTER_TO_INT(action->data); + ui_update_statusbar(idx, -1); + ui_document_show_hide(idx); + break; + } + case UNDO_ENCODING: + { + // use the "old" encoding + document_redo_add(idx, UNDO_ENCODING, g_strdup(doc_list[idx].encoding)); + + document_set_encoding(idx, (const gchar*)action->data); + + app->ignore_callback = TRUE; + encodings_select_radio_item((const gchar*)action->data); + app->ignore_callback = FALSE; + + g_free(action->data); + break; + } + default: break; + } + } + g_free(action); // free the action which was taken from the stack + + if (g_trash_stack_height(&doc_list[idx].undo_actions) == 0) + { + doc_list[idx].changed = FALSE; + document_set_text_changed(idx); + } + else + doc_list[idx].changed = TRUE; + + ui_update_popup_reundo_items(idx); + //geany_debug("%s: new stack height: %d", __func__, g_trash_stack_height(&doc_list[idx].undo_actions)); +} + + gboolean document_can_redo(gint idx) { - if (idx == -1 || ! doc_list[idx].is_valid) return FALSE; + if (! DOC_IDX_VALID(idx)) return FALSE; - return sci_can_redo(doc_list[idx].sci); + if (g_trash_stack_height(&doc_list[idx].redo_actions) > 0 || sci_can_redo(doc_list[idx].sci)) + return TRUE; + else + return FALSE; } -void document_undo(gint idx) +void document_redo(gint idx) { undo_action *action; -#if 1 - sci_undo(doc_list[idx].sci); - return; -#endif + if (! DOC_IDX_VALID(idx)) return; - if (idx == -1 || ! doc_list[idx].is_valid) return; + action = g_trash_stack_pop(&doc_list[idx].redo_actions); - action = g_trash_stack_pop(&doc_list[idx].undo_actions); - if (action == NULL) { // fallback, should not be necessary - sci_undo(doc_list[idx].sci); + geany_debug("%s: fallback used", __func__); + sci_redo(doc_list[idx].sci); } else { @@ -1620,13 +1697,15 @@ { case UNDO_SCINTILLA: { - geany_debug("undo: Scintilla"); - sci_undo(doc_list[idx].sci); + document_undo_add(idx, UNDO_SCINTILLA, NULL); + + sci_redo(doc_list[idx].sci); break; } case UNDO_BOM: { - geany_debug("undo: BOM"); + document_undo_add(idx, UNDO_BOM, GINT_TO_POINTER(doc_list[idx].has_bom)); + doc_list[idx].has_bom = GPOINTER_TO_INT(action->data); ui_update_statusbar(idx, -1); ui_document_show_hide(idx); @@ -1634,28 +1713,46 @@ } case UNDO_ENCODING: { - geany_debug("undo: Encoding"); - doc_list[idx].encoding = (gchar*) action->data; - ui_update_statusbar(idx, -1); - encodings_select_radio_item(doc_list[idx].encoding); - gtk_widget_set_sensitive(lookup_widget(app->window, "menu_write_unicode_bom1"), - utils_is_unicode_charset(doc_list[idx].encoding)); + document_undo_add(idx, UNDO_ENCODING, g_strdup(doc_list[idx].encoding)); + + document_set_encoding(idx, (const gchar*)action->data); + + app->ignore_callback = TRUE; + encodings_select_radio_item((const gchar*)action->data); + app->ignore_callback = FALSE; + + g_free(action->data); break; } default: break; } } + g_free(action); // free the action which was taken from the stack - if (g_trash_stack_height(&doc_list[idx].undo_actions) == 0) doc_list[idx].changed = FALSE; ui_update_popup_reundo_items(idx); - geany_debug("%s: new stack height: %d", __func__, g_trash_stack_height(&doc_list[idx].undo_actions)); + //geany_debug("%s: new stack height: %d", __func__, g_trash_stack_height(&doc_list[idx].redo_actions)); } -void document_redo(gint idx) +static void document_redo_add(gint idx, guint type, gpointer data) { - if (idx == -1 || ! doc_list[idx].is_valid) return; + undo_action *action; - sci_redo(doc_list[idx].sci); + if (! DOC_IDX_VALID(idx)) return; + + action = g_new0(undo_action, 1); + action->type = type; + action->data = data; + + g_trash_stack_push(&doc_list[idx].redo_actions, action); + + doc_list[idx].changed = TRUE; + document_set_text_changed(idx); + ui_update_popup_reundo_items(idx); + + //geany_debug("%s: new stack height: %d, added type: %d", __func__, + //g_trash_stack_height(&doc_list[idx].redo_actions), action->type); } + + Modified: trunk/src/document.h =================================================================== --- trunk/src/document.h 2006-10-10 14:27:58 UTC (rev 877) +++ trunk/src/document.h 2006-10-10 16:02:41 UTC (rev 878) @@ -175,11 +175,14 @@ void document_ensure_final_newline(gint idx); +void document_set_encoding(gint idx, const gchar *new_encoding); /* own Undo / Redo implementation to be able to undo / redo changes * to the encoding or the Unicode BOM (which are Scintilla independet). * All Scintilla events are stored in the undo / redo buffer and are passed through. */ + +// available UNDO actions, UNDO_SCINTILLA is a pseudo action to trigger Scintilla's undo management enum { UNDO_SCINTILLA = 0, @@ -188,11 +191,13 @@ UNDO_ACTIONS_MAX }; +// an undo action, also used for redo actions typedef struct { - GTrashStack *next; - guint type; // to identify the action - gpointer *data; // the old value (before the change) + GTrashStack *next; // pointer to the next stack element(required for the GTrashStack) + guint type; // to identify the action + gpointer *data; // the old value (before the change), in case of a redo action it contains + // the new value } undo_action; gboolean document_can_undo(gint idx); @@ -205,8 +210,4 @@ void document_undo_add(gint idx, guint type, gpointer data); -void document_undo_clear(gint idx); - -void document_redo_clear(gint idx); - #endif Modified: trunk/src/sci_cb.c =================================================================== --- trunk/src/sci_cb.c 2006-10-10 14:27:58 UTC (rev 877) +++ trunk/src/sci_cb.c 2006-10-10 16:02:41 UTC (rev 878) @@ -153,26 +153,16 @@ #endif break; } - case 2023: + case SCN_MODIFIED: { - geany_debug("Undo notification"); - break; - } -/* case SCN_KEY: - { - //geany_debug("key notification triggered with %c", nt->ch); - break; - } - case SCN_MODIFIED: - { - if (nt->modificationType & SC_MOD_INSERTTEXT || - nt->modificationType & SC_MOD_DELETETEXT) + if (nt->modificationType & SC_START_ACTION && ! app->ignore_callback) { + // get notified about undo changes document_undo_add(idx, UNDO_SCINTILLA, NULL); } break; } -*/ case SCN_CHARADDED: + case SCN_CHARADDED: { gint pos = sci_get_current_position(sci); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [877] trunk/scintilla
by eht16＠users.sourceforge.net 10 Oct '06

10 Oct '06

Revision: 877 http://svn.sourceforge.net/geany/?rev=877&view=rev Author: eht16 Date: 2006-10-10 07:27:58 -0700 (Tue, 10 Oct 2006) Log Message: ----------- Applied patch from Armel Asselin (thanks). It adds SC_START_ACTION notification. Modified Paths: -------------- trunk/scintilla/CellBuffer.cxx trunk/scintilla/CellBuffer.h trunk/scintilla/Document.cxx trunk/scintilla/include/Scintilla.h Modified: trunk/scintilla/CellBuffer.cxx =================================================================== --- trunk/scintilla/CellBuffer.cxx 2006-10-10 13:52:22 UTC (rev 876) +++ trunk/scintilla/CellBuffer.cxx 2006-10-10 14:27:58 UTC (rev 877) @@ -316,10 +316,10 @@ delete linesData[line].handleSet; linesData[line].handleSet = 0; } else { - bool performedDeletion = + bool performedDeletion = linesData[line].handleSet->RemoveNumber(markerNum); while (all && performedDeletion) { - performedDeletion = + performedDeletion = linesData[line].handleSet->RemoveNumber(markerNum); } if (linesData[line].handleSet->Length() == 0) { @@ -446,7 +446,7 @@ } } -void UndoHistory::AppendAction(actionType at, int position, char *data, int lengthData) { +void UndoHistory::AppendAction(actionType at, int position, char *data, int lengthData, bool &startSequence) { EnsureUndoRoom(); //Platform::DebugPrintf("%% %d action %d %d %d\n", at, position, lengthData, currentAction); //Platform::DebugPrintf("^ %d action %d %d\n", actions[currentAction - 1].at, @@ -454,6 +454,8 @@ if (currentAction < savePoint) { savePoint = -1; } + + int oldCurrentAction = currentAction; if (currentAction >= 1) { if (0 == undoSequenceDepth) { // Top level actions may not always be coalesced @@ -497,6 +499,7 @@ } else { currentAction++; } + startSequence = oldCurrentAction!=currentAction; actions[currentAction].Create(at, position, data, lengthData); currentAction++; actions[currentAction].Create(startAction); @@ -714,7 +717,7 @@ return ByteAt(position*2 + 1); } -const char *CellBuffer::InsertString(int position, char *s, int insertLength) { +const char *CellBuffer::InsertString(int position, char *s, int insertLength, bool &startSequence) { char *data = 0; // InsertString and DeleteChars are the bottleneck though which all changes occur if (!readOnly) { @@ -725,7 +728,7 @@ for (int i = 0; i < insertLength / 2; i++) { data[i] = s[i * 2]; } - uh.AppendAction(insertAction, position / 2, data, insertLength / 2); + uh.AppendAction(insertAction, position / 2, data, insertLength / 2, startSequence); } BasicInsertString(position, s, insertLength); @@ -760,7 +763,7 @@ return changed; } -const char *CellBuffer::DeleteChars(int position, int deleteLength) { +const char *CellBuffer::DeleteChars(int position, int deleteLength, bool &startSequence) { // InsertString and DeleteChars are the bottleneck though which all changes occur PLATFORM_ASSERT(deleteLength > 0); char *data = 0; @@ -771,7 +774,7 @@ for (int i = 0; i < deleteLength / 2; i++) { data[i] = ByteAt(position + i * 2); } - uh.AppendAction(removeAction, position / 2, data, deleteLength / 2); + uh.AppendAction(removeAction, position / 2, data, deleteLength / 2, startSequence); } BasicDeleteChars(position, deleteLength); Modified: trunk/scintilla/CellBuffer.h =================================================================== --- trunk/scintilla/CellBuffer.h 2006-10-10 13:52:22 UTC (rev 876) +++ trunk/scintilla/CellBuffer.h 2006-10-10 14:27:58 UTC (rev 877) @@ -119,7 +119,7 @@ UndoHistory(); ~UndoHistory(); - void AppendAction(actionType at, int position, char *data, int length); + void AppendAction(actionType at, int position, char *data, int length, bool &startSequence); void BeginUndoAction(); void EndUndoAction(); @@ -190,14 +190,14 @@ int Lines(); int LineStart(int line); int LineFromPosition(int pos) { return lv.LineFromPosition(pos); } - const char *InsertString(int position, char *s, int insertLength); + const char *InsertString(int position, char *s, int insertLength, bool &startSequence); /// Setting styles for positions outside the range of the buffer is safe and has no effect. /// @return true if the style of a character is changed. bool SetStyleAt(int position, char style, char mask='\377'); bool SetStyleFor(int position, int length, char style, char mask); - const char *DeleteChars(int position, int deleteLength); + const char *DeleteChars(int position, int deleteLength, bool &startSequence); bool IsReadOnly(); void SetReadOnly(bool set); Modified: trunk/scintilla/Document.cxx =================================================================== --- trunk/scintilla/Document.cxx 2006-10-10 13:52:22 UTC (rev 876) +++ trunk/scintilla/Document.cxx 2006-10-10 14:27:58 UTC (rev 877) @@ -380,7 +380,8 @@ 0, 0)); int prevLinesTotal = LinesTotal(); bool startSavePoint = cb.IsSavePoint(); - const char *text = cb.DeleteChars(pos * 2, len * 2); + bool startSequence=false; + const char *text = cb.DeleteChars(pos * 2, len * 2, startSequence); if (startSavePoint && cb.IsCollectingUndo()) NotifySavePoint(!startSavePoint); if ((pos < Length()) || (pos == 0)) @@ -389,7 +390,7 @@ ModifiedAt(pos-1); NotifyModified( DocModification( - SC_MOD_DELETETEXT | SC_PERFORMED_USER, + SC_MOD_DELETETEXT | SC_PERFORMED_USER | (startSequence?SC_START_ACTION:0), pos, len, LinesTotal() - prevLinesTotal, text)); } @@ -415,13 +416,14 @@ 0, s)); int prevLinesTotal = LinesTotal(); bool startSavePoint = cb.IsSavePoint(); - const char *text = cb.InsertString(position, s, insertLength); + bool startSequence=false; + const char *text = cb.InsertString(position, s, insertLength, startSequence); if (startSavePoint && cb.IsCollectingUndo()) NotifySavePoint(!startSavePoint); ModifiedAt(position / 2); NotifyModified( DocModification( - SC_MOD_INSERTTEXT | SC_PERFORMED_USER, + SC_MOD_INSERTTEXT | SC_PERFORMED_USER | (startSequence?SC_START_ACTION:0), position / 2, insertLength / 2, LinesTotal() - prevLinesTotal, text)); } Modified: trunk/scintilla/include/Scintilla.h =================================================================== --- trunk/scintilla/include/Scintilla.h 2006-10-10 13:52:22 UTC (rev 876) +++ trunk/scintilla/include/Scintilla.h 2006-10-10 14:27:58 UTC (rev 877) @@ -647,7 +647,8 @@ #define SC_MOD_BEFOREINSERT 0x400 #define SC_MOD_BEFOREDELETE 0x800 #define SC_MULTILINEUNDOREDO 0x1000 -#define SC_MODEVENTMASKALL 0x1FFF +#define SC_START_ACTION 0x2000 +#define SC_MODEVENTMASKALL 0x2FFF #define SCEN_CHANGE 768 #define SCEN_SETFOCUS 512 #define SCEN_KILLFOCUS 256 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

10 Oct '06

Revision: 876 http://svn.sourceforge.net/geany/?rev=876&view=rev Author: eht16 Date: 2006-10-10 06:52:22 -0700 (Tue, 10 Oct 2006) Log Message: ----------- Connect only once to the "sci-notify" signal. Modified Paths: -------------- trunk/ChangeLog trunk/src/document.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-10-09 16:08:53 UTC (rev 875) +++ trunk/ChangeLog 2006-10-10 13:52:22 UTC (rev 876) @@ -1,3 +1,8 @@ +2006-10-10 Enrico Tröger <enrico.troeger(a)uvena.de> + + * src/document.c: Connect only once to the "sci-notify" signal. + + 2006-10-09 Nick Treleaven <nick.treleaven(a)btinternet.com> * src/win32.c, src/geany.h, src/callbacks.c, src/search.c, Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2006-10-09 16:08:53 UTC (rev 875) +++ trunk/src/document.c 2006-10-10 13:52:22 UTC (rev 876) @@ -668,16 +668,16 @@ document_set_filetype(idx, use_ft); // also sets taglist ui_update_build_menu(idx); + + // "the" SCI signal (connect after initial setup(i.e. adding text)) + g_signal_connect((GtkWidget*) doc_list[idx].sci, "sci-notify", + G_CALLBACK(on_editor_notification), GINT_TO_POINTER(idx)); } else { // reloading document_update_tag_list(idx, TRUE); } - // "the" SCI signal (connect after initial setup(i.e. adding text)) - g_signal_connect((GtkWidget*) doc_list[idx].sci, "sci-notify", - G_CALLBACK(on_editor_notification), GINT_TO_POINTER(idx)); - document_set_text_changed(idx); ui_document_show_hide(idx); //update the document menu This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

09 Oct '06

Revision: 875 http://svn.sourceforge.net/geany/?rev=875&view=rev Author: ntrel Date: 2006-10-09 09:08:53 -0700 (Mon, 09 Oct 2006) Log Message: ----------- Removed the GEANY_MAX_OPEN_FILES limit, using a dynamic array. Modified Paths: -------------- trunk/ChangeLog trunk/src/callbacks.c trunk/src/dialogs.c trunk/src/document.c trunk/src/document.h trunk/src/geany.h trunk/src/main.c trunk/src/prefs.c trunk/src/search.c trunk/src/ui_utils.c trunk/src/win32.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-10-09 13:50:23 UTC (rev 874) +++ trunk/ChangeLog 2006-10-09 16:08:53 UTC (rev 875) @@ -1,3 +1,11 @@ +2006-10-09 Nick Treleaven <nick.treleaven(a)btinternet.com> + + * src/win32.c, src/geany.h, src/callbacks.c, src/search.c, + src/document.c, src/document.h, src/prefs.c, src/dialogs.c, + src/main.c, src/ui_utils.c: + Removed the GEANY_MAX_OPEN_FILES limit, using a dynamic array. + + 2006-10-09 Enrico Tröger <enrico.troeger(a)uvena.de> * src/dialogs.c: Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2006-10-09 13:50:23 UTC (rev 874) +++ trunk/src/callbacks.c 2006-10-09 16:08:53 UTC (rev 875) @@ -91,6 +91,10 @@ filetypes_free_types(); styleset_free_styles(); templates_free_templates(); + msgwin_finalize(); + search_finalize(); + document_finalize(); + tm_workspace_free(TM_WORK_OBJECT(app->tm_workspace)); g_strfreev(html_entities); g_free(app->configdir); @@ -114,9 +118,6 @@ } g_queue_free(app->recent_queue); - msgwin_finalize(); - search_finalize(); - if (app->prefs_dialog && GTK_IS_WIDGET(app->prefs_dialog)) gtk_widget_destroy(app->prefs_dialog); if (app->save_filesel && GTK_IS_WIDGET(app->save_filesel)) gtk_widget_destroy(app->save_filesel); if (app->open_filesel && GTK_IS_WIDGET(app->open_filesel)) gtk_widget_destroy(app->open_filesel); @@ -165,10 +166,10 @@ if (gtk_notebook_get_n_pages(GTK_NOTEBOOK(app->notebook)) > 0) { - gint i; + guint i; gboolean has_dirty_editors = FALSE; - for (i = 0; i < GEANY_MAX_OPEN_FILES; i++) + for (i = 0; i < doc_array->len; i++) { if (doc_list[i].is_valid && doc_list[i].changed) { @@ -830,21 +831,10 @@ flist = filelist; while(flist != NULL) { - if (gtk_notebook_get_n_pages(GTK_NOTEBOOK(app->notebook)) < GEANY_MAX_OPEN_FILES) + if (g_file_test((gchar*) flist->data, G_FILE_TEST_IS_REGULAR | G_FILE_TEST_IS_SYMLINK)) { - if (g_file_test((gchar*) flist->data, G_FILE_TEST_IS_REGULAR | G_FILE_TEST_IS_SYMLINK)) - { - document_open_file(-1, (gchar*) flist->data, 0, ro, ft, NULL); - } + document_open_file(-1, (gchar*) flist->data, 0, ro, ft, NULL); } - else - { - dialogs_show_error( - _("You have opened too many files. There is a limit of %d concurrent open files."), - GEANY_MAX_OPEN_FILES); - g_slist_foreach(flist, (GFunc)g_free, NULL); - break; - } g_free(flist->data); flist = flist->next; } @@ -1277,9 +1267,8 @@ on_find_usage1_activate (GtkMenuItem *menuitem, gpointer user_data) { - gint i, pos, line = -1; - gint flags; - gint idx; + guint i; + gint pos, line = -1, flags, idx; struct TextToFind ttf; gchar *buffer, *short_file_name, *string, *search_text; @@ -1299,7 +1288,7 @@ flags = SCFIND_MATCHCASE | SCFIND_WHOLEWORD; } - for(i = 0; i < GEANY_MAX_OPEN_FILES; i++) + for(i = 0; i < doc_array->len; i++) { if (doc_list[i].is_valid) { Modified: trunk/src/dialogs.c =================================================================== --- trunk/src/dialogs.c 2006-10-09 13:50:23 UTC (rev 874) +++ trunk/src/dialogs.c 2006-10-09 16:08:53 UTC (rev 875) @@ -54,103 +54,91 @@ /* This shows the file selection dialog to open a file. */ void dialogs_show_open_file () { - if (gtk_notebook_get_n_pages(GTK_NOTEBOOK(app->notebook)) < GEANY_MAX_OPEN_FILES) - { #ifdef G_OS_WIN32 - win32_show_file_dialog(TRUE); + win32_show_file_dialog(TRUE); #else /* X11, not win32: use GTK_FILE_CHOOSER */ + gchar *initdir; - /* We use the same file selection widget each time, so first - of all we create it if it hasn't already been created. */ - if (app->open_filesel == NULL) - { - GtkWidget *combo; - GtkWidget *viewbtn; - GtkTooltips *tooltips = GTK_TOOLTIPS(lookup_widget(app->window, "tooltips")); - gint i; + /* We use the same file selection widget each time, so first + of all we create it if it hasn't already been created. */ + if (app->open_filesel == NULL) + { + GtkWidget *combo; + GtkWidget *viewbtn; + GtkTooltips *tooltips = GTK_TOOLTIPS(lookup_widget(app->window, "tooltips")); + gint i; - app->open_filesel = gtk_file_chooser_dialog_new(_("Open File"), GTK_WINDOW(app->window), - GTK_FILE_CHOOSER_ACTION_OPEN, NULL, NULL); + app->open_filesel = gtk_file_chooser_dialog_new(_("Open File"), GTK_WINDOW(app->window), + GTK_FILE_CHOOSER_ACTION_OPEN, NULL, NULL); - viewbtn = gtk_button_new_with_mnemonic(_("_View")); - gtk_tooltips_set_tip(tooltips, viewbtn, - _("Opens the file in read-only mode. If you choose more than one file to open, all files will be opened read-only."), NULL); - gtk_widget_show(viewbtn); - gtk_dialog_add_action_widget(GTK_DIALOG(app->open_filesel), - viewbtn, GTK_RESPONSE_APPLY); - gtk_dialog_add_buttons(GTK_DIALOG(app->open_filesel), - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL); - // set default Open, so pressing enter can open multiple files - gtk_dialog_set_default_response(GTK_DIALOG(app->open_filesel), - GTK_RESPONSE_ACCEPT); + viewbtn = gtk_button_new_with_mnemonic(_("_View")); + gtk_tooltips_set_tip(tooltips, viewbtn, + _("Opens the file in read-only mode. If you choose more than one file to open, all files will be opened read-only."), NULL); + gtk_widget_show(viewbtn); + gtk_dialog_add_action_widget(GTK_DIALOG(app->open_filesel), + viewbtn, GTK_RESPONSE_APPLY); + gtk_dialog_add_buttons(GTK_DIALOG(app->open_filesel), + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL); + // set default Open, so pressing enter can open multiple files + gtk_dialog_set_default_response(GTK_DIALOG(app->open_filesel), + GTK_RESPONSE_ACCEPT); - gtk_widget_set_size_request(app->open_filesel, 520, 460); - gtk_window_set_modal(GTK_WINDOW(app->open_filesel), TRUE); - gtk_window_set_destroy_with_parent(GTK_WINDOW(app->open_filesel), TRUE); - gtk_window_set_skip_taskbar_hint(GTK_WINDOW(app->open_filesel), TRUE); - gtk_window_set_type_hint(GTK_WINDOW(app->open_filesel), GDK_WINDOW_TYPE_HINT_DIALOG); - gtk_window_set_transient_for(GTK_WINDOW(app->open_filesel), GTK_WINDOW(app->window)); - gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(app->open_filesel), TRUE); + gtk_widget_set_size_request(app->open_filesel, 520, 460); + gtk_window_set_modal(GTK_WINDOW(app->open_filesel), TRUE); + gtk_window_set_destroy_with_parent(GTK_WINDOW(app->open_filesel), TRUE); + gtk_window_set_skip_taskbar_hint(GTK_WINDOW(app->open_filesel), TRUE); + gtk_window_set_type_hint(GTK_WINDOW(app->open_filesel), GDK_WINDOW_TYPE_HINT_DIALOG); + gtk_window_set_transient_for(GTK_WINDOW(app->open_filesel), GTK_WINDOW(app->window)); + gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(app->open_filesel), TRUE); - // add checkboxes and filename entry - gtk_file_chooser_set_extra_widget(GTK_FILE_CHOOSER(app->open_filesel), - add_file_open_extra_widget()); - combo = lookup_widget(app->open_filesel, "filetype_combo"); + // add checkboxes and filename entry + gtk_file_chooser_set_extra_widget(GTK_FILE_CHOOSER(app->open_filesel), + add_file_open_extra_widget()); + combo = lookup_widget(app->open_filesel, "filetype_combo"); - // add FileFilters(start with "All Files") - gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(app->open_filesel), - filetypes_create_file_filter(filetypes[GEANY_FILETYPES_ALL])); - for (i = 0; i < GEANY_MAX_FILE_TYPES - 1; i++) + // add FileFilters(start with "All Files") + gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(app->open_filesel), + filetypes_create_file_filter(filetypes[GEANY_FILETYPES_ALL])); + for (i = 0; i < GEANY_MAX_FILE_TYPES - 1; i++) + { + if (filetypes[i]) { - if (filetypes[i]) - { - gtk_combo_box_append_text(GTK_COMBO_BOX(combo), filetypes[i]->title); - gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(app->open_filesel), - filetypes_create_file_filter(filetypes[i])); - } + gtk_combo_box_append_text(GTK_COMBO_BOX(combo), filetypes[i]->title); + gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(app->open_filesel), + filetypes_create_file_filter(filetypes[i])); } - gtk_combo_box_append_text(GTK_COMBO_BOX(combo), _("Detect by file extension ")); - gtk_combo_box_set_active(GTK_COMBO_BOX(combo), GEANY_MAX_FILE_TYPES - 1); + } + gtk_combo_box_append_text(GTK_COMBO_BOX(combo), _("Detect by file extension ")); + gtk_combo_box_set_active(GTK_COMBO_BOX(combo), GEANY_MAX_FILE_TYPES - 1); - g_signal_connect((gpointer) app->open_filesel, "selection-changed", - G_CALLBACK(on_file_open_selection_changed), NULL); - g_signal_connect ((gpointer) app->open_filesel, "delete_event", - G_CALLBACK(gtk_widget_hide), NULL); - g_signal_connect((gpointer) app->open_filesel, "response", - G_CALLBACK(on_file_open_dialog_response), NULL); + g_signal_connect((gpointer) app->open_filesel, "selection-changed", + G_CALLBACK(on_file_open_selection_changed), NULL); + g_signal_connect ((gpointer) app->open_filesel, "delete_event", + G_CALLBACK(gtk_widget_hide), NULL); + g_signal_connect((gpointer) app->open_filesel, "response", + G_CALLBACK(on_file_open_dialog_response), NULL); + } - } + // set dialog directory to the current file's directory, if present + initdir = utils_get_current_file_dir(); + if (initdir != NULL) + { + gchar *locale_filename; - // set dialog directory to the current file's directory, if present - { - gchar *initdir = utils_get_current_file_dir(); + locale_filename = utils_get_locale_from_utf8(initdir); - if (initdir != NULL) - { - gchar *locale_filename; + if (g_path_is_absolute(locale_filename)) + gtk_file_chooser_set_current_folder( + GTK_FILE_CHOOSER(app->open_filesel), locale_filename); - locale_filename = utils_get_locale_from_utf8(initdir); + g_free(initdir); + g_free(locale_filename); + } - if (g_path_is_absolute(locale_filename)) - gtk_file_chooser_set_current_folder( - GTK_FILE_CHOOSER(app->open_filesel), locale_filename); - - g_free(initdir); - g_free(locale_filename); - } - } - - gtk_file_chooser_unselect_all(GTK_FILE_CHOOSER(app->open_filesel)); - gtk_widget_show(app->open_filesel); + gtk_file_chooser_unselect_all(GTK_FILE_CHOOSER(app->open_filesel)); + gtk_widget_show(app->open_filesel); #endif - } - else - { - dialogs_show_error( - _("You have opened too many files. There is a limit of %d concurrent open files."), - GEANY_MAX_OPEN_FILES); - } } Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2006-10-09 13:50:23 UTC (rev 874) +++ trunk/src/document.c 2006-10-09 16:08:53 UTC (rev 875) @@ -59,6 +59,10 @@ #include "vte.h" +/* dynamic array of document elements to hold all information of the notebook tabs */ +GArray *doc_array; + + /* Returns -1 if no text found or the new range endpoint after replacing. */ static gint document_replace_range(gint idx, const gchar *find_text, const gchar *replace_text, @@ -74,7 +78,7 @@ if (! filename) return -1; - for(i = 0; i < GEANY_MAX_OPEN_FILES; i++) + for(i = 0; i < doc_array->len; i++) { gchar *dl_fname = (is_tm_filename && doc_list[i].tm_file) ? doc_list[i].tm_file->file_name : doc_list[i].file_name; @@ -96,7 +100,7 @@ if (! sci) return -1; - for(i = 0; i < GEANY_MAX_OPEN_FILES; i++) + for(i = 0; i < doc_array->len; i++) { if (doc_list[i].is_valid && doc_list[i].sci == sci) return i; } @@ -108,7 +112,7 @@ gint document_get_n_idx(guint page_num) { ScintillaObject *sci; - if (page_num >= GEANY_MAX_OPEN_FILES) return -1; + if (page_num >= doc_array->len) return -1; sci = (ScintillaObject*)gtk_notebook_get_nth_page( GTK_NOTEBOOK(app->notebook), page_num); @@ -139,21 +143,15 @@ } -/* returns the next free place(i.e. index) in the document list - * If there is for any reason no free place, -1 is returned - */ -gint document_get_new_idx() +void document_init_doclist() { - guint i; + doc_array = g_array_new(FALSE, FALSE, sizeof(document)); +} - for(i = 0; i < GEANY_MAX_OPEN_FILES; i++) - { - if (doc_list[i].sci == NULL) - { - return (gint) i; - } - } - return -1; + +void document_finalize() +{ + g_array_free(doc_array, TRUE); } @@ -180,33 +178,6 @@ } -/* sets in all document structs the flag is_valid to FALSE and initializes some members to NULL, - * to mark it uninitialized. The flag is_valid is set to TRUE in document_create_new_sci(). */ -void document_init_doclist() -{ - gint i; - - for (i = 0; i < GEANY_MAX_OPEN_FILES; i++) - { - doc_list[i].is_valid = FALSE; - doc_list[i].has_tags = FALSE; - doc_list[i].use_auto_indention = app->pref_editor_use_auto_indention; - doc_list[i].line_breaking = app->pref_editor_line_breaking; - doc_list[i].readonly = FALSE; - doc_list[i].tag_store = NULL; - doc_list[i].tag_tree = NULL; - doc_list[i].file_name = NULL; - doc_list[i].file_type = NULL; - doc_list[i].tm_file = NULL; - doc_list[i].encoding = NULL; - doc_list[i].has_bom = FALSE; - doc_list[i].sci = NULL; - doc_list[i].undo_actions = NULL; - doc_list[i].redo_actions = NULL; - } -} - - // Apply just the prefs that can change in the Preferences dialog void document_apply_update_prefs(ScintillaObject *sci) { @@ -223,6 +194,45 @@ } +/* Sets is_valid to FALSE and initializes some members to NULL, to mark it uninitialized. + * The flag is_valid is set to TRUE in document_create_new_sci(). */ +static void init_doc_struct(document *new_doc) +{ + new_doc->is_valid = FALSE; + new_doc->has_tags = FALSE; + new_doc->use_auto_indention = app->pref_editor_use_auto_indention; + new_doc->line_breaking = app->pref_editor_line_breaking; + new_doc->readonly = FALSE; + new_doc->tag_store = NULL; + new_doc->tag_tree = NULL; + new_doc->file_name = NULL; + new_doc->file_type = NULL; + new_doc->tm_file = NULL; + new_doc->encoding = NULL; + new_doc->has_bom = FALSE; + new_doc->sci = NULL; + new_doc->undo_actions = NULL; + new_doc->redo_actions = NULL; +} + + +/* 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() +{ + guint i; + + for(i = 0; i < doc_array->len; i++) + { + if (doc_list[i].sci == NULL) + { + return (gint) i; + } + } + return -1; +} + + /* creates a new tab in the notebook and does all related stuff * finally it returns the index of the created document */ gint document_create_new_sci(const gchar *filename) @@ -243,10 +253,15 @@ } new_idx = document_get_new_idx(); - if (new_idx == -1) return -1; + if (new_idx == -1) // expand the array, no free places + { + document new_doc; + init_doc_struct(&new_doc); + new_idx = doc_array->len; + g_array_append_val(doc_array, new_doc); + } + this = &doc_list[new_idx]; - this = &(doc_list[new_idx]); - /* SCI - Code */ sci = SCINTILLA(scintilla_new()); scintilla_set_id(sci, new_idx); @@ -311,6 +326,7 @@ this->has_tags = FALSE; this->is_valid = TRUE; + g_assert(doc_list[new_idx].sci == sci); return new_idx; } @@ -320,7 +336,7 @@ { gint idx = document_get_n_idx(page_num); - if (idx >= 0 && idx <= GEANY_MAX_OPEN_FILES) + if (DOC_IDX_VALID(idx)) { if (doc_list[idx].changed && ! dialogs_show_unsaved_file(idx)) { @@ -367,54 +383,39 @@ current filename to NULL. */ void document_new_file(filetype *ft) { - if (gtk_notebook_get_n_pages(GTK_NOTEBOOK(app->notebook)) < GEANY_MAX_OPEN_FILES) - { - gint idx = document_create_new_sci(NULL); - gchar *template = document_prepare_template(ft); + gint idx = document_create_new_sci(NULL); + gchar *template = document_prepare_template(ft); - if (idx == -1) - { - dialogs_show_error( - _("You have opened too many files. There is a limit of %d concurrent open files."), - GEANY_MAX_OPEN_FILES); - return; - } + g_assert(idx != -1); - sci_clear_all(doc_list[idx].sci); - sci_set_text(doc_list[idx].sci, template); - g_free(template); + sci_clear_all(doc_list[idx].sci); + sci_set_text(doc_list[idx].sci, template); + g_free(template); - doc_list[idx].encoding = g_strdup(encodings[app->pref_editor_default_encoding].charset); - //document_set_filetype(idx, (ft == NULL) ? filetypes[GEANY_FILETYPES_ALL] : ft); - 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_update_build_menu(idx); - doc_list[idx].mtime = time(NULL); - doc_list[idx].changed = FALSE; - document_set_text_changed(idx); - ui_document_show_hide(idx); //update the document menu + doc_list[idx].encoding = g_strdup(encodings[app->pref_editor_default_encoding].charset); + //document_set_filetype(idx, (ft == NULL) ? filetypes[GEANY_FILETYPES_ALL] : ft); + 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_update_build_menu(idx); + doc_list[idx].mtime = time(NULL); + doc_list[idx].changed = FALSE; + document_set_text_changed(idx); + ui_document_show_hide(idx); //update the document menu #ifdef G_OS_WIN32 - sci_set_eol_mode(doc_list[idx].sci, SC_EOL_CRLF); + sci_set_eol_mode(doc_list[idx].sci, SC_EOL_CRLF); #else - sci_set_eol_mode(doc_list[idx].sci, SC_EOL_LF); + sci_set_eol_mode(doc_list[idx].sci, SC_EOL_LF); #endif - sci_set_line_numbers(doc_list[idx].sci, app->show_linenumber_margin, 0); - sci_empty_undo_buffer(doc_list[idx].sci); - sci_goto_pos(doc_list[idx].sci, 0, TRUE); + sci_set_line_numbers(doc_list[idx].sci, app->show_linenumber_margin, 0); + sci_empty_undo_buffer(doc_list[idx].sci); + sci_goto_pos(doc_list[idx].sci, 0, TRUE); - // "the" SCI signal (connect after initial setup(i.e. adding text)) - g_signal_connect((GtkWidget*) doc_list[idx].sci, "sci-notify", - G_CALLBACK(on_editor_notification), GINT_TO_POINTER(idx)); + // "the" SCI signal (connect after initial setup(i.e. adding text)) + g_signal_connect((GtkWidget*) doc_list[idx].sci, "sci-notify", + G_CALLBACK(on_editor_notification), GINT_TO_POINTER(idx)); - msgwin_status_add(_("New file opened.")); - } - else - { - dialogs_show_error( - _("You have opened too many files. There is a limit of %d concurrent open files."), - GEANY_MAX_OPEN_FILES); - } + msgwin_status_add(_("New file opened.")); } @@ -1182,7 +1183,7 @@ } } } - for (n = 0; n < GEANY_MAX_OPEN_FILES; n++) + for (n = 0; n < doc_array->len; n++) { if (doc_list[n].sci) { Modified: trunk/src/document.h =================================================================== --- trunk/src/document.h 2006-10-09 13:50:23 UTC (rev 874) +++ trunk/src/document.h 2006-10-09 16:08:53 UTC (rev 875) @@ -35,10 +35,6 @@ #include "filetypes.h" -#define DOC_IDX_VALID(idx) \ - ((idx) >= 0 && (idx) < GEANY_MAX_OPEN_FILES && doc_list[idx].is_valid) - - /* structure for representing an open tab with all its related stuff. */ typedef struct document { @@ -68,11 +64,17 @@ } document; -/* array of document elements to hold all information of the notebook tabs */ -document doc_list[GEANY_MAX_OPEN_FILES]; +/* 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; */ +#define doc_list ((document *)doc_array->data) +#define DOC_IDX_VALID(idx) \ + ((idx) >= 0 && (guint)(idx) < doc_array->len && doc_list[idx].is_valid) + /* returns the index of the notebook page which has the given filename */ gint document_find_by_filename(const gchar*, gboolean is_tm_filename); @@ -81,6 +83,9 @@ gint document_find_by_sci(ScintillaObject*); +/* 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(); @@ -88,23 +93,14 @@ document *document_get_current(); -/* returns the index of the given notebook page in the document list */ -gint document_get_n_idx(guint); +void document_init_doclist(); +void document_finalize(); -/* returns the next free place(i.e. index) in the document list - * If there is for any reason no free place, -1 is returned */ -gint document_get_new_idx(); - void document_set_text_changed(gint); -/* sets in all document structs the flag is_valid to FALSE and initializes some members to NULL, - * to mark it uninitialized. The flag is_valid is set to TRUE in document_create_new_sci(). */ -void document_init_doclist(); - - // Apply just the prefs that can change in the Preferences dialog void document_apply_update_prefs(ScintillaObject *sci); @@ -114,9 +110,8 @@ gint document_create_new_sci(const gchar*); -/* removes the given notebook tab and clears the related entry in the document - * list */ -gboolean document_remove(guint); +/* removes the given notebook tab and clears the related entry in the document list */ +gboolean document_remove(guint page_num); /* This creates a new document, by clearing the text widget and setting the Modified: trunk/src/geany.h =================================================================== --- trunk/src/geany.h 2006-10-09 13:50:23 UTC (rev 874) +++ trunk/src/geany.h 2006-10-09 16:08:53 UTC (rev 875) @@ -38,7 +38,6 @@ #define GEANY_FILEDEFS_SUBDIR "filedefs" #define GEANY_CODENAME "Kintaro" #define GEANY_HOMEPAGE "http://geany.uvena.de/" -#define GEANY_MAX_OPEN_FILES 25 #define GEANY_SESSION_FILES 25 #define GEANY_MAX_TAGS_COUNT 1000 #define GEANY_CHECK_FILE_DELAY 30 Modified: trunk/src/main.c =================================================================== --- trunk/src/main.c 2006-10-09 13:50:23 UTC (rev 874) +++ trunk/src/main.c 2006-10-09 16:08:53 UTC (rev 875) @@ -567,25 +567,14 @@ app->opening_session_files = TRUE; if (argc > 1) { - gint i, opened = 0; + gint i; for(i = 1; i < argc; i++) { if (argv[i] && g_file_test(argv[i], G_FILE_TEST_IS_REGULAR || G_FILE_TEST_IS_SYMLINK)) { - if (opened < GEANY_MAX_OPEN_FILES) - { - gchar *filename = get_argv_filename(argv[i]); - document_open_file(-1, filename, 0, FALSE, NULL, NULL); - g_free(filename); - opened++; - } - else - { - dialogs_show_error( - _("You have opened too many files. There is a limit of %d concurrent open files."), - GEANY_MAX_OPEN_FILES); - break; - } + gchar *filename = get_argv_filename(argv[i]); + document_open_file(-1, filename, 0, FALSE, NULL, NULL); + g_free(filename); } } } Modified: trunk/src/prefs.c =================================================================== --- trunk/src/prefs.c 2006-10-09 13:50:23 UTC (rev 874) +++ trunk/src/prefs.c 2006-10-09 16:08:53 UTC (rev 875) @@ -366,7 +366,7 @@ if (response == GTK_RESPONSE_OK) { GtkWidget *widget; - gint i; + guint i; // General settings widget = lookup_widget(app->prefs_dialog, "spin_mru"); @@ -609,7 +609,7 @@ gtk_notebook_set_tab_pos(GTK_NOTEBOOK(app->treeview_notebook), app->tab_pos_sidebar); // re-colourise all open documents, if tab width or long line settings have changed - for (i = 0; i < GEANY_MAX_OPEN_FILES; i++) + for (i = 0; i < doc_array->len; i++) { if (doc_list[i].is_valid) { @@ -669,7 +669,7 @@ void on_prefs_font_choosed(GtkFontButton *widget, gpointer user_data) { const gchar *fontbtn = gtk_font_button_get_font_name(widget); - gint i; + guint i; switch (GPOINTER_TO_INT(user_data)) { @@ -678,7 +678,7 @@ if (strcmp(fontbtn, app->tagbar_font) == 0) break; g_free(app->tagbar_font); app->tagbar_font = g_strdup(fontbtn); - for (i = 0; i < GEANY_MAX_OPEN_FILES; i++) + for (i = 0; i < doc_array->len; i++) { if (doc_list[i].is_valid && GTK_IS_WIDGET(doc_list[i].tag_tree)) gtk_widget_modify_font(doc_list[i].tag_tree, Modified: trunk/src/search.c =================================================================== --- trunk/src/search.c 2006-10-09 13:50:23 UTC (rev 874) +++ trunk/src/search.c 2006-10-09 16:08:53 UTC (rev 875) @@ -729,8 +729,8 @@ if (search_in_all_buffers_re && response == GEANY_RESPONSE_REPLACE_ALL) { - gint i; - for (i = 0; i < GEANY_MAX_OPEN_FILES; i++) + guint i; + for (i = 0; i < doc_array->len; i++) { if (! doc_list[i].is_valid) continue; Modified: trunk/src/ui_utils.c =================================================================== --- trunk/src/ui_utils.c 2006-10-09 13:50:23 UTC (rev 874) +++ trunk/src/ui_utils.c 2006-10-09 16:08:53 UTC (rev 875) @@ -135,7 +135,8 @@ void ui_set_editor_font(const gchar *font_name) { - gint i, size; + guint i; + gint size; gchar *fname; PangoFontDescription *font_desc; @@ -153,7 +154,7 @@ size = pango_font_description_get_size(font_desc) / PANGO_SCALE; /* We copy the current style, and update the font in all open tabs. */ - for(i = 0; i < GEANY_MAX_OPEN_FILES; i++) + for(i = 0; i < doc_array->len; i++) { if (doc_list[i].sci) { Modified: trunk/src/win32.c =================================================================== --- trunk/src/win32.c 2006-10-09 13:50:23 UTC (rev 874) +++ trunk/src/win32.c 2006-10-09 16:08:53 UTC (rev 875) @@ -145,16 +145,7 @@ x = of.nFileOffset - 1; if (x != strlen(fname)) { // open a single file - if (gtk_notebook_get_n_pages(GTK_NOTEBOOK(app->notebook)) >= GEANY_MAX_OPEN_FILES) - { - dialogs_show_error( - _("You have opened too many files. There is a limit of %d concurrent open files."), - GEANY_MAX_OPEN_FILES); - } - else - { - document_open_file(-1, fname, 0, of.Flags & OFN_READONLY, NULL, NULL); - } + document_open_file(-1, fname, 0, of.Flags & OFN_READONLY, NULL, NULL); } else { // open mutiple files @@ -162,9 +153,7 @@ { if (! fname[x]) { - if (! fname[x+1] && ( - gtk_notebook_get_n_pages(GTK_NOTEBOOK(app->notebook)) < GEANY_MAX_OPEN_FILES)) - break; + if (! fname[x+1]) break; g_snprintf(file_name, 254, "%s\\%s", fname, fname + x + 1); document_open_file(-1, file_name, 0, of.Flags & OFN_READONLY, NULL, NULL); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

09 Oct '06

Revision: 874 http://svn.sourceforge.net/geany/?rev=874&view=rev Author: eht16 Date: 2006-10-09 06:50:23 -0700 (Mon, 09 Oct 2006) Log Message: ----------- Made string "Permissions" in the file property dialog translatable. Modified Paths: -------------- trunk/ChangeLog trunk/src/dialogs.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-10-08 21:43:54 UTC (rev 873) +++ trunk/ChangeLog 2006-10-09 13:50:23 UTC (rev 874) @@ -1,3 +1,9 @@ +2006-10-09 Enrico Tröger <enrico.troeger(a)uvena.de> + + * src/dialogs.c: + Made string "Permissions" in the file property dialog translatable. + + 2006-10-08 Enrico Tröger <enrico.troeger(a)uvena.de> * src/highlighting.c, data/filetypes.ferite: Added some new keywords. Modified: trunk/src/dialogs.c =================================================================== --- trunk/src/dialogs.c 2006-10-08 21:43:54 UTC (rev 873) +++ trunk/src/dialogs.c 2006-10-09 13:50:23 UTC (rev 874) @@ -802,7 +802,7 @@ response = gtk_dialog_run(GTK_DIALOG(dialog)); // call the callback manually on_includes_arguments_dialog_response(GTK_DIALOG(dialog), response, ft); - + gtk_widget_destroy(dialog); } @@ -1021,7 +1021,7 @@ gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), gtk_label_new("")); // create permission label and then table with the permissions - label = gtk_label_new("<b>Permissions:</b>"); + label = gtk_label_new(_("<b>Permissions:</b>")); gtk_label_set_use_markup(GTK_LABEL(label), TRUE); gtk_misc_set_alignment(GTK_MISC(label), 0, 0); gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), label); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

08 Oct '06

Revision: 873 http://svn.sourceforge.net/geany/?rev=873&view=rev Author: eht16 Date: 2006-10-08 14:43:54 -0700 (Sun, 08 Oct 2006) Log Message: ----------- Added additional header files for compatibility with FreeBSD. Modified Paths: -------------- trunk/ChangeLog trunk/src/socket.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-10-08 15:52:31 UTC (rev 872) +++ trunk/ChangeLog 2006-10-08 21:43:54 UTC (rev 873) @@ -3,6 +3,8 @@ * src/highlighting.c, data/filetypes.ferite: Added some new keywords. * src/sci_cb.c: Added auto completion for iferr construct for filetype Ferite. + * src/socket.c: + Added additional header files for compatibility with FreeBSD. 2006-10-08 Nick Treleaven <nick.treleaven(a)btinternet.com> Modified: trunk/src/socket.c =================================================================== --- trunk/src/socket.c 2006-10-08 15:52:31 UTC (rev 872) +++ trunk/src/socket.c 2006-10-08 21:43:54 UTC (rev 873) @@ -26,6 +26,9 @@ #ifdef HAVE_SOCKET #ifndef G_OS_WIN32 +# include <string.h> +# include <sys/time.h> +# include <sys/types.h> # include <sys/socket.h> # include <sys/un.h> # include <netinet/in.h> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

08 Oct '06

Revision: 872 http://svn.sourceforge.net/geany/?rev=872&view=rev Author: eht16 Date: 2006-10-08 08:52:31 -0700 (Sun, 08 Oct 2006) Log Message: ----------- Added some new keywords for filetype Ferite. Added auto completion for iferr construct for filetype Ferite. Modified Paths: -------------- trunk/ChangeLog trunk/data/filetypes.ferite trunk/src/highlighting.c trunk/src/sci_cb.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-10-08 12:53:33 UTC (rev 871) +++ trunk/ChangeLog 2006-10-08 15:52:31 UTC (rev 872) @@ -1,3 +1,10 @@ +2006-10-08 Enrico Tröger <enrico.troeger(a)uvena.de> + + * src/highlighting.c, data/filetypes.ferite: Added some new keywords. + * src/sci_cb.c: + Added auto completion for iferr construct for filetype Ferite. + + 2006-10-08 Nick Treleaven <nick.treleaven(a)btinternet.com> * tagmanager/tm_source_file.c: Modified: trunk/data/filetypes.ferite =================================================================== --- trunk/data/filetypes.ferite 2006-10-08 12:53:33 UTC (rev 871) +++ trunk/data/filetypes.ferite 2006-10-08 15:52:31 UTC (rev 872) @@ -23,8 +23,8 @@ [keywords] # all items must be in one line -primary=false null self super true abstract alias arguments attribute_missing break case class closure conformsToProtocol constructor default deliver destructor diliver do else extends final fix for function if iferr implements include instanceof method_missing modifies namespace new private protected protocol public recipient rename return static switch uses using while -types=string number array object void XML Unix Sys String Stream Serialize RMI Posix Number Network Math FileSystem Console Array +primary=false null self super true abstract alias and arguments attribute_missing break case class closure conformsToProtocol constructor continue default deliver destructor diliver directive do else extends eval final fix for function global handle if iferr implements include instanceof isa method_missing modifies monitor namespace new or private protected protocol public raise recipient rename return static switch uses using while +types=boolean string number array object void XML Unix Sys String Stream Serialize RMI Posix Number Network Math FileSystem Console Array Regexp XSLT docComment=brief class declaration description end example extends function group implements modifies module namespace param protocol return return static type variable warning [settings] Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2006-10-08 12:53:33 UTC (rev 871) +++ trunk/src/highlighting.c 2006-10-08 15:52:31 UTC (rev 872) @@ -2585,9 +2585,9 @@ get_keyfile_int(config, config_home, "styling", "styling_within_preprocessor", 1, 0, &style_sets[GEANY_FILETYPES_FERITE].styling[19]); style_sets[GEANY_FILETYPES_FERITE].keywords = g_new(gchar*, 4); - get_keyfile_keywords(config, config_home, "keywords", "primary", GEANY_FILETYPES_FERITE, 0, "false null self super true abstract alias arguments attribute_missing break case class closure conformsToProtocol constructor default deliver destructor diliver do else extends final fix for function if iferr implements include instanceof method_missing modifies namespace new private protected protocol public recipient rename return static switch uses using while"); - get_keyfile_keywords(config, config_home, "keywords", "types", GEANY_FILETYPES_FERITE, 1, "number string array object void"); - get_keyfile_keywords(config, config_home, "keywords", "docComment", GEANY_FILETYPES_FERITE, 2, "@brief @class @declaration @description @end @example @extends @function @group @implements @modifies @module @namespace @param @protocol @return @return @static @type @variable @warning"); + get_keyfile_keywords(config, config_home, "keywords", "primary", GEANY_FILETYPES_FERITE, 0, "false null self super true abstract alias and arguments attribute_missing break case class closure conformsToProtocol constructor continue default deliver destructor diliver directive do else extends eval final fix for function global handle if iferr implements include instanceof isa method_missing modifies monitor namespace new or private protected protocol public raise recipient rename return static switch uses using while"); + get_keyfile_keywords(config, config_home, "keywords", "types", GEANY_FILETYPES_FERITE, 1, "boolean string number array object void"); + get_keyfile_keywords(config, config_home, "keywords", "docComment", GEANY_FILETYPES_FERITE, 2, "brief class declaration description end example extends function group implements modifies module namespace param protocol return return static type variable warning"); style_sets[GEANY_FILETYPES_FERITE].keywords[3] = NULL; get_keyfile_wordchars(config, config_home, GEANY_WORDCHARS, Modified: trunk/src/sci_cb.c =================================================================== --- trunk/src/sci_cb.c 2006-10-08 12:53:33 UTC (rev 871) +++ trunk/src/sci_cb.c 2006-10-08 15:52:31 UTC (rev 872) @@ -906,7 +906,18 @@ sci_goto_pos(sci, pos + 1, TRUE); g_free(construct); } + else if (! strncmp("iferr", buf + 10, 5)) + { + if (doc_list[idx].file_type->id != GEANY_FILETYPES_FERITE || + ! isspace(*(buf + 9))) goto free_and_return; + construct = g_strdup_printf("%s{%s\t%s}%sfix%s{%s\t%s}%s", eol, eol, eol, eol, eol, eol, eol, eol); + + SSM(sci, SCI_INSERTTEXT, pos, (sptr_t) construct); + sci_goto_pos(sci, pos + 4 + (2 * strlen(indent)), TRUE); + g_free(construct); + } + free_and_return: g_free(eol); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

08 Oct '06

Revision: 871 http://svn.sourceforge.net/geany/?rev=871&view=rev Author: ntrel Date: 2006-10-08 05:53:33 -0700 (Sun, 08 Oct 2006) Log Message: ----------- Only parse tags once for simple parsers Modified Paths: -------------- trunk/ChangeLog trunk/tagmanager/tm_source_file.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-10-06 23:40:58 UTC (rev 870) +++ trunk/ChangeLog 2006-10-08 12:53:33 UTC (rev 871) @@ -1,3 +1,9 @@ +2006-10-08 Nick Treleaven <nick.treleaven(a)btinternet.com> + + * tagmanager/tm_source_file.c: + Only parse tags once for simple parsers. + + 2006-10-06 Enrico Tröger <enrico.troeger(a)uvena.de> * tagmanager/python.c: Improved Python parser to support nested classes. Modified: trunk/tagmanager/tm_source_file.c =================================================================== --- trunk/tagmanager/tm_source_file.c 2006-10-06 23:40:58 UTC (rev 870) +++ trunk/tagmanager/tm_source_file.c 2006-10-08 12:53:33 UTC (rev 871) @@ -121,16 +121,18 @@ if (source_file->lang < 0 || ! LanguageTable [source_file->lang]->enabled) return status; - //while ((TRUE == status) && (passCount < 3)) - // parse files only once instead of three times until we know why - while ((TRUE == status) && (passCount < 1)) + while ((TRUE == status) && (passCount < 3)) { if (source_file->work_object.tags_array) tm_tags_array_free(source_file->work_object.tags_array, FALSE); if (fileOpen (file_name, source_file->lang)) { if (LanguageTable [source_file->lang]->parser != NULL) + { LanguageTable [source_file->lang]->parser (); + fileClose (); + break; + } else if (LanguageTable [source_file->lang]->parser2 != NULL) status = LanguageTable [source_file->lang]->parser2 (passCount); fileClose (); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

07 Oct '06

Revision: 870 http://svn.sourceforge.net/geany/?rev=870&view=rev Author: eht16 Date: 2006-10-06 16:40:58 -0700 (Fri, 06 Oct 2006) Log Message: ----------- Changed foreground colour for LaTeX sytle "math" to differentiate it from the "comment" style. Modified Paths: -------------- trunk/ChangeLog trunk/data/filetypes.latex trunk/src/highlighting.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-10-06 23:23:05 UTC (rev 869) +++ trunk/ChangeLog 2006-10-06 23:40:58 UTC (rev 870) @@ -4,6 +4,9 @@ * src/filetypes.c, src/document.c: Implemented simple "shebang" detection. It is used prior to the filename extension detection. + * src/highlighting.c, data/filetypes.latex: + Changed foreground colour for LaTeX sytle "math" to differentiate it + from the "comment" style. 2006-10-04 Enrico Tröger <enrico.troeger(a)uvena.de> Modified: trunk/data/filetypes.latex =================================================================== --- trunk/data/filetypes.latex 2006-10-06 23:23:05 UTC (rev 869) +++ trunk/data/filetypes.latex 2006-10-06 23:40:58 UTC (rev 870) @@ -4,7 +4,7 @@ default=0x00002f;0xffffff;false;false command=0xff0000;0xffffff;true;false tag=0x007f7f;0xffffff;true;false -math=0x007f00;0xffffff;false;false +math=0x00007f;0xffffff;false;false comment=0x007f00;0xffffff;false;true [keywords] Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2006-10-06 23:23:05 UTC (rev 869) +++ trunk/src/highlighting.c 2006-10-06 23:40:58 UTC (rev 870) @@ -858,7 +858,7 @@ get_keyfile_hex(config, config_home, "styling", "default", "0x00002f", "0xffffff", "false", &style_sets[GEANY_FILETYPES_LATEX].styling[0]); get_keyfile_hex(config, config_home, "styling", "command", "0xff0000", "0xffffff", "true", &style_sets[GEANY_FILETYPES_LATEX].styling[1]); get_keyfile_hex(config, config_home, "styling", "tag", "0x007f7f", "0xffffff", "true", &style_sets[GEANY_FILETYPES_LATEX].styling[2]); - get_keyfile_hex(config, config_home, "styling", "math", "0x007f00", "0xffffff", "false", &style_sets[GEANY_FILETYPES_LATEX].styling[3]); + get_keyfile_hex(config, config_home, "styling", "math", "0x00007f", "0xffffff", "false", &style_sets[GEANY_FILETYPES_LATEX].styling[3]); get_keyfile_hex(config, config_home, "styling", "comment", "0x007f00", "0xffffff", "false", &style_sets[GEANY_FILETYPES_LATEX].styling[4]); style_sets[GEANY_FILETYPES_LATEX].keywords = g_new(gchar*, 2); 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