Commits May 2007

commits@lists.geany.org

3 participants
94 discussions

SF.net SVN: geany: [1588] trunk
by eht16＠users.sourceforge.net 31 May '07

31 May '07

Revision: 1588 http://svn.sourceforge.net/geany/?rev=1588&view=rev Author: eht16 Date: 2007-05-31 06:55:00 -0700 (Thu, 31 May 2007) Log Message: ----------- Add Haskell to make_comment_block(). Modified Paths: -------------- trunk/ChangeLog trunk/src/templates.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-05-29 16:30:54 UTC (rev 1587) +++ trunk/ChangeLog 2007-05-31 13:55:00 UTC (rev 1588) @@ -1,3 +1,8 @@ +2007-05-31 Enrico Tröger <enrico.troeger(a)uvena.de> + + * src/templates.c: Add Haskell to make_comment_block(). + + 2007-05-29 Nick Treleaven <nick.treleaven(a)btinternet.com> * src/build.c, src/utils.c, src/utils.h, src/keybindings.c, @@ -12,8 +17,8 @@ 2007-05-29 Enrico Tröger <enrico.troeger(a)uvena.de> * doc/geany.docbook: - Removed app_small entity. - Added description for global configuration file. + Remove app_small entity. + Add description for global configuration file. 2007-05-28 Nick Treleaven <nick.treleaven(a)btinternet.com> Modified: trunk/src/templates.c =================================================================== --- trunk/src/templates.c 2007-05-29 16:30:54 UTC (rev 1587) +++ trunk/src/templates.c 2007-05-31 13:55:00 UTC (rev 1588) @@ -412,6 +412,7 @@ break; } + case GEANY_FILETYPES_HASKELL: case GEANY_FILETYPES_VHDL: case GEANY_FILETYPES_LUA: { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1587] trunk
by ntrel＠users.sourceforge.net 29 May '07

29 May '07

Revision: 1587 http://svn.sourceforge.net/geany/?rev=1587&view=rev Author: ntrel Date: 2007-05-29 09:30:54 -0700 (Tue, 29 May 2007) Log Message: ----------- Move MyApp::pref_editor_* to editor.h, using editor_prefs struct. Move INDENT_* enums to editor.h. Move utils_get_whitespace() to editor.c. Modified Paths: -------------- trunk/ChangeLog trunk/src/build.c trunk/src/callbacks.c trunk/src/document.c trunk/src/editor.c trunk/src/editor.h trunk/src/geany.h trunk/src/keybindings.c trunk/src/keyfile.c trunk/src/main.c trunk/src/prefs.c trunk/src/ui_utils.c trunk/src/utils.c trunk/src/utils.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-05-29 12:40:43 UTC (rev 1586) +++ trunk/ChangeLog 2007-05-29 16:30:54 UTC (rev 1587) @@ -1,3 +1,14 @@ +2007-05-29 Nick Treleaven <nick.treleaven(a)btinternet.com> + + * src/build.c, src/utils.c, src/utils.h, src/keybindings.c, + src/prefs.c, src/geany.h, src/callbacks.c, src/keyfile.c, + src/document.c, src/main.c, src/editor.c, src/editor.h, + src/ui_utils.c: + Move MyApp::pref_editor_* to editor.h, using editor_prefs struct. + Move INDENT_* enums to editor.h. + Move utils_get_whitespace() to editor.c. + + 2007-05-29 Enrico Tröger <enrico.troeger(a)uvena.de> * doc/geany.docbook: Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2007-05-29 12:40:43 UTC (rev 1586) +++ trunk/src/build.c 2007-05-29 16:30:54 UTC (rev 1587) @@ -50,6 +50,7 @@ #include "keybindings.h" #include "vte.h" #include "project.h" +#include "editor.h" BuildInfo build_info = {GBO_COMPILE, 0, NULL, GEANY_FILETYPES_ALL, NULL}; @@ -797,7 +798,7 @@ dir = tmp; } - if (app->pref_editor_use_indicators) + if (editor_prefs.use_indicators) { gchar *filename; gint line; Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2007-05-29 12:40:43 UTC (rev 1586) +++ trunk/src/callbacks.c 2007-05-29 16:30:54 UTC (rev 1587) @@ -1886,7 +1886,7 @@ line = sci_get_current_line(doc_list[idx].sci, old_pos); ind_pos = sci_get_line_indent_position(doc_list[idx].sci, line); // when using tabs increase cur pos by 1, when using space increase it by tab_width - step = (app->pref_editor_use_tabs) ? 1 : app->pref_editor_tab_width; + step = (editor_prefs.use_tabs) ? 1 : editor_prefs.tab_width; new_pos = (old_pos > ind_pos) ? old_pos + step : old_pos; sci_set_current_position(doc_list[idx].sci, ind_pos, TRUE); @@ -1914,7 +1914,7 @@ old_pos = sci_get_current_position(doc_list[idx].sci); line = sci_get_current_line(doc_list[idx].sci, old_pos); ind_pos = sci_get_line_indent_position(doc_list[idx].sci, line); - step = (app->pref_editor_use_tabs) ? 1 : app->pref_editor_tab_width; + step = (editor_prefs.use_tabs) ? 1 : editor_prefs.tab_width; new_pos = (old_pos >= ind_pos) ? old_pos - step : old_pos; if (ind_pos == sci_get_position_from_line(doc_list[idx].sci, line)) @@ -1922,7 +1922,7 @@ sci_set_current_position(doc_list[idx].sci, ind_pos, TRUE); indent = sci_get_line_indentation(doc_list[idx].sci, line); - indent -= app->pref_editor_tab_width; + indent -= editor_prefs.tab_width; if (indent < 0) indent = 0; sci_set_line_indentation(doc_list[idx].sci, line, indent); Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2007-05-29 12:40:43 UTC (rev 1586) +++ trunk/src/document.c 2007-05-29 16:30:54 UTC (rev 1587) @@ -200,21 +200,21 @@ ScintillaObject *sci = doc_list[idx].sci; sci_set_mark_long_lines(sci, app->long_line_type, app->long_line_column, app->long_line_color); - sci_set_tab_width(sci, app->pref_editor_tab_width); + sci_set_tab_width(sci, editor_prefs.tab_width); - sci_set_use_tabs(sci, app->pref_editor_use_tabs); + sci_set_use_tabs(sci, editor_prefs.use_tabs); // remove indent spaces on backspace, if using spaces to indent - SSM(sci, SCI_SETBACKSPACEUNINDENTS, ! app->pref_editor_use_tabs, 0); + SSM(sci, SCI_SETBACKSPACEUNINDENTS, ! editor_prefs.use_tabs, 0); sci_set_autoc_max_height(sci, app->autocompletion_max_height); - sci_set_indentionguides(sci, app->pref_editor_show_indent_guide); - sci_set_visible_white_spaces(sci, app->pref_editor_show_white_space); - sci_set_visible_eols(sci, app->pref_editor_show_line_endings); + sci_set_indentionguides(sci, editor_prefs.show_indent_guide); + sci_set_visible_white_spaces(sci, editor_prefs.show_white_space); + sci_set_visible_eols(sci, editor_prefs.show_line_endings); - sci_set_folding_margin_visible(sci, app->pref_editor_folding); + sci_set_folding_margin_visible(sci, editor_prefs.folding); - doc_list[idx].use_auto_indention = (app->pref_editor_indention_mode != INDENT_NONE); + doc_list[idx].use_auto_indention = (editor_prefs.indention_mode != INDENT_NONE); } @@ -224,8 +224,8 @@ { new_doc->is_valid = FALSE; new_doc->has_tags = FALSE; - new_doc->use_auto_indention = (app->pref_editor_indention_mode != INDENT_NONE); - new_doc->line_breaking = app->pref_editor_line_breaking; + new_doc->use_auto_indention = (editor_prefs.indention_mode != INDENT_NONE); + new_doc->line_breaking = editor_prefs.line_breaking; new_doc->readonly = FALSE; new_doc->tag_store = NULL; new_doc->tag_tree = NULL; @@ -308,8 +308,8 @@ sci_set_tab_indents(sci, app->use_tab_to_indent); sci_set_symbol_margin(sci, app->show_markers_margin); sci_set_line_numbers(sci, app->show_linenumber_margin, 0); - sci_set_lines_wrapped(sci, app->pref_editor_line_breaking); - sci_set_scrollbar_mode(sci, app->pref_editor_show_scrollbars); + sci_set_lines_wrapped(sci, editor_prefs.line_breaking); + sci_set_scrollbar_mode(sci, editor_prefs.show_scrollbars); // signal for insert-key(works without too, but to update the right status bar) //g_signal_connect((GtkWidget*) sci, "key-press-event", @@ -338,8 +338,8 @@ this->changed = FALSE; this->last_check = time(NULL); this->readonly = FALSE; - this->line_breaking = app->pref_editor_line_breaking; - this->use_auto_indention = (app->pref_editor_indention_mode != INDENT_NONE); + this->line_breaking = editor_prefs.line_breaking; + this->use_auto_indention = (editor_prefs.indention_mode != INDENT_NONE); this->has_tags = FALSE; treeviews_openfiles_add(new_idx); // sets this->iter @@ -440,7 +440,7 @@ 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); + doc_list[idx].encoding = g_strdup(encodings[editor_prefs.default_encoding].charset); // store the opened encoding for undo/redo store_saved_encoding(idx); @@ -977,11 +977,11 @@ } // replaces tabs by spaces - if (app->pref_editor_replace_tabs) document_replace_tabs(idx); + if (editor_prefs.replace_tabs) document_replace_tabs(idx); // strip trailing spaces - if (app->pref_editor_trail_space) document_strip_trailing_spaces(idx); + if (editor_prefs.trail_space) document_strip_trailing_spaces(idx); // ensure the file has a newline at the end - if (app->pref_editor_new_line) document_ensure_final_newline(idx); + if (editor_prefs.new_line) document_ensure_final_newline(idx); // ensure there a really the same EOL chars sci_convert_eols(doc_list[idx].sci, sci_get_eol_mode(doc_list[idx].sci)); Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2007-05-29 12:40:43 UTC (rev 1586) +++ trunk/src/editor.c 2007-05-29 16:30:54 UTC (rev 1587) @@ -44,6 +44,9 @@ static gchar current_word[GEANY_MAX_WORD_LENGTH]; // holds word under the mouse or keyboard cursor +// Initialised in keyfile.c. +EditorPrefs editor_prefs; + EditorInfo editor_info = {current_word, -1}; static struct @@ -77,7 +80,7 @@ if (event->button == 1) { - if (GDK_BUTTON_PRESS==event->type && app->pref_editor_disable_dnd) + if (GDK_BUTTON_PRESS == event->type && editor_prefs.disable_dnd) { gint ss = sci_get_selection_start(doc_list[idx].sci); sci_set_selection_end(doc_list[idx].sci, ss); @@ -115,12 +118,12 @@ sci_set_marker_at_line(sci, line, ! set, 1); // toggle the marker } // left click on the folding margin to toggle folding state of current line - else if (nt->margin == 2 && app->pref_editor_folding) + else if (nt->margin == 2 && editor_prefs.folding) { gint line = SSM(sci, SCI_LINEFROMPOSITION, nt->position, 0); SSM(sci, SCI_TOGGLEFOLD, line, 0); - if (app->pref_editor_unfold_all_children && + if (editor_prefs.unfold_all_children && SSM(sci, SCI_GETLINEVISIBLE, line + 1, 0)) { // unfold all children of the current fold point gint last_line = SSM(sci, SCI_GETLASTCHILD, line, -1); @@ -230,7 +233,7 @@ case '}': { // closing bracket handling if (doc_list[idx].use_auto_indention && - app->pref_editor_indention_mode == INDENT_ADVANCED) + editor_prefs.indention_mode == INDENT_ADVANCED) editor_close_block(idx, pos - 1); break; } @@ -359,6 +362,40 @@ } +/* Returns a string containing width chars of whitespace according to the + * setting editor_prefs.use_tabs filled with simple space characters or with the right number + * of tab characters. (Result is filled with tabs *and* spaces if width isn't a multiple of + * editor_prefs.tab_width). + * If alternative is set to TRUE, it uses the opposite of editor_prefs.use_tabs. */ +static gchar * +get_whitespace(gint width, gboolean alternative) +{ + gchar *str; + gboolean use_tabs; + + g_return_val_if_fail(width > 0, NULL); + + use_tabs = (alternative) ? ! editor_prefs.use_tabs : editor_prefs.use_tabs; + + if (use_tabs) + { // first fill text with tabluators and fill the rest with spaces + gint tabs = width / editor_prefs.tab_width; + gint spaces = width % editor_prefs.tab_width; + gint len = tabs + spaces; + + str = g_malloc(len + 1); + + memset(str, '\t', tabs); + memset(str + tabs, ' ', spaces); + str[len] = '\0'; + } + else + str = g_strnfill(width, ' '); + + return str; +} + + static void on_new_line_added(ScintillaObject *sci, gint idx) { gint pos = sci_get_current_position(sci); @@ -369,7 +406,7 @@ get_indent(sci, pos, FALSE); sci_add_text(sci, indent); - if (app->pref_editor_indention_mode == INDENT_ADVANCED) + if (editor_prefs.indention_mode == INDENT_ADVANCED) { // add extra indentation for Python after colon if (FILETYPE_ID(doc_list[idx].file_type) == GEANY_FILETYPES_PYTHON && @@ -377,14 +414,14 @@ sci_get_style_at(sci, pos - 2) == SCE_P_OPERATOR) { // creates and inserts one tabulator sign or whitespace of the amount of the tab width - gchar *text = utils_get_whitespace(app->pref_editor_tab_width, FALSE); + gchar *text = get_whitespace(editor_prefs.tab_width, FALSE); sci_add_text(sci, text); g_free(text); } } } - if (app->pref_editor_auto_complete_constructs) + if (editor_prefs.auto_complete_constructs) { // " * " auto completion in multiline C/C++/D/Java comments auto_multiline(sci, pos); @@ -419,7 +456,7 @@ { guint j = *idx; - if (app->pref_editor_use_tabs) + if (editor_prefs.use_tabs) { if (j < len - 1) // leave room for a \0 terminator. buf[j++] = '\t'; @@ -427,7 +464,7 @@ else { // insert as many spaces as a tab would take guint k; - for (k = 0; k < (guint) app->pref_editor_tab_width && k < len - 1; k++) + for (k = 0; k < (guint) editor_prefs.tab_width && k < len - 1; k++) buf[j++] = ' '; } *idx = j; @@ -452,7 +489,7 @@ { if (linebuf[i] == ' ' || linebuf[i] == '\t') // simple indentation indent[j++] = linebuf[i]; - else if (app->pref_editor_indention_mode != INDENT_ADVANCED) + else if (editor_prefs.indention_mode != INDENT_ADVANCED) break; else if (use_this_line) break; @@ -489,7 +526,7 @@ static void auto_close_bracket(ScintillaObject *sci, gint pos, gchar c) { - if (! app->pref_editor_auto_complete_constructs || SSM(sci, SCI_GETLEXER, 0, 0) != SCLEX_LATEX) + if (! editor_prefs.auto_complete_constructs || SSM(sci, SCI_GETLEXER, 0, 0) != SCLEX_LATEX) return; if (c == '[') @@ -598,7 +635,7 @@ if (line_indent < last_indent) return; - line_indent -= app->pref_editor_tab_width; + line_indent -= editor_prefs.tab_width; line_indent = MAX(0, line_indent); sci_set_line_indentation(sci, line, line_indent); } @@ -917,7 +954,7 @@ gchar *wordchars; filetype *ft; - if ((! app->pref_editor_auto_complete_symbols && ! force) || + if ((! editor_prefs.auto_complete_symbols && ! force) || ! DOC_IDX_VALID(idx) || doc_list[idx].file_type == NULL) return FALSE; @@ -1245,7 +1282,7 @@ eol = g_strconcat(utils_get_eol_char(idx), indent, NULL); // get the whitespace for additional indentation - space = utils_get_whitespace(app->pref_editor_tab_width, FALSE); + space = get_whitespace(editor_prefs.tab_width, FALSE); sci_start_undo_action(sci); // needed while we insert a space separately from construct result = complete_constructs(idx, pos, buf, space, eol); @@ -1284,7 +1321,7 @@ // If the user has turned us off, quit now. // This may make sense only in certain languages - if (! app->pref_editor_auto_close_xml_tags || (lexer != SCLEX_HTML && lexer != SCLEX_XML)) + if (! editor_prefs.auto_close_xml_tags || (lexer != SCLEX_HTML && lexer != SCLEX_XML)) return FALSE; pos = sci_get_current_position(sci); @@ -1970,7 +2007,7 @@ /* if there is one too many spaces, delete the last space, * to return to the indent used before the multiline comment was started. */ - if (indent_len % app->pref_editor_tab_width == 1) + if (indent_len % editor_prefs.tab_width == 1) SSM(sci, SCI_DELETEBACKNOTLINE, 0, 0); // remove whitespace indent g_free(previous_line); return; @@ -2262,7 +2299,7 @@ void editor_insert_alternative_whitespace(ScintillaObject *sci) { // creates and inserts one tabulator sign or whitespace of the amount of the tab width - gchar *text = utils_get_whitespace(app->pref_editor_tab_width, TRUE); + gchar *text = get_whitespace(editor_prefs.tab_width, TRUE); sci_add_text(sci, text); g_free(text); } Modified: trunk/src/editor.h =================================================================== --- trunk/src/editor.h 2007-05-29 12:40:43 UTC (rev 1586) +++ trunk/src/editor.h 2007-05-29 16:30:54 UTC (rev 1587) @@ -34,8 +34,43 @@ #define SSM(s, m, w, l) scintilla_send_message(s, m, w, l) +enum +{ + INDENT_NONE = 0, + INDENT_BASIC, + INDENT_ADVANCED +}; + +/* These are the default prefs when creating a new editor window. + * Some of these can be overridden per document. */ typedef struct { + gboolean line_breaking; + gint indention_mode; + gboolean use_indicators; + gboolean show_white_space; + gboolean show_indent_guide; + gboolean show_line_endings; + gboolean auto_complete_symbols; + gboolean auto_close_xml_tags; + gboolean auto_complete_constructs; + gboolean folding; + gboolean unfold_all_children; + gboolean show_scrollbars; + gint tab_width; + gboolean use_tabs; + gint default_encoding; + gboolean new_line; + gboolean replace_tabs; + gboolean trail_space; + gboolean disable_dnd; +} EditorPrefs; + +extern EditorPrefs editor_prefs; + + +typedef struct +{ gchar *current_word; // holds word under the mouse or keyboard cursor gint click_pos; // text position where the mouse was clicked } EditorInfo; Modified: trunk/src/geany.h =================================================================== --- trunk/src/geany.h 2007-05-29 12:40:43 UTC (rev 1586) +++ trunk/src/geany.h 2007-05-29 16:30:54 UTC (rev 1587) @@ -103,27 +103,6 @@ gboolean brace_match_ltgt; gboolean use_tab_to_indent; gboolean main_window_realized; - // I know, it is a bit confusing, but this line breaking is globally, - // to change the default value at startup, I think - gboolean pref_editor_line_breaking; - gint pref_editor_indention_mode; - gboolean pref_editor_use_indicators; - gboolean pref_editor_show_white_space; - gboolean pref_editor_show_indent_guide; - gboolean pref_editor_show_line_endings; - gboolean pref_editor_auto_complete_symbols; - gboolean pref_editor_auto_close_xml_tags; - gboolean pref_editor_auto_complete_constructs; - gboolean pref_editor_folding; - gboolean pref_editor_unfold_all_children; - gboolean pref_editor_show_scrollbars; - gint pref_editor_tab_width; - gboolean pref_editor_use_tabs; - gint pref_editor_default_encoding; - gboolean pref_editor_new_line; - gboolean pref_editor_replace_tabs; - gboolean pref_editor_trail_space; - gboolean pref_editor_disable_dnd; gboolean pref_main_load_session; gboolean pref_main_save_winpos; gboolean pref_main_confirm_exit; @@ -221,13 +200,6 @@ enum { - INDENT_NONE = 0, - INDENT_BASIC, - INDENT_ADVANCED -}; - -enum -{ KILOBYTE = 1024, MEGABYTE = (KILOBYTE*1024), GIGABYTE = (MEGABYTE*1024) Modified: trunk/src/keybindings.c =================================================================== --- trunk/src/keybindings.c 2007-05-29 12:40:43 UTC (rev 1586) +++ trunk/src/keybindings.c 2007-05-29 16:30:54 UTC (rev 1587) @@ -616,7 +616,7 @@ ScintillaObject *sci = doc_list[idx].sci; gint pos = sci_get_current_position(sci); - if (app->pref_editor_auto_complete_constructs) + if (editor_prefs.auto_complete_constructs) return editor_auto_forif(idx, pos); } } Modified: trunk/src/keyfile.c =================================================================== --- trunk/src/keyfile.c 2007-05-29 12:40:43 UTC (rev 1586) +++ trunk/src/keyfile.c 2007-05-29 16:30:54 UTC (rev 1587) @@ -48,6 +48,7 @@ #include "msgwindow.h" #include "search.h" #include "project.h" +#include "editor.h" static gchar *scribble_text = NULL; @@ -174,26 +175,26 @@ g_key_file_set_boolean(config, PACKAGE, "sidebar_visible", app->sidebar_visible); g_key_file_set_boolean(config, PACKAGE, "statusbar_visible", app->statusbar_visible); g_key_file_set_boolean(config, PACKAGE, "msgwindow_visible", app->msgwindow_visible); - g_key_file_set_boolean(config, PACKAGE, "use_folding", app->pref_editor_folding); - g_key_file_set_boolean(config, PACKAGE, "unfold_all_children", app->pref_editor_unfold_all_children); - g_key_file_set_boolean(config, PACKAGE, "show_editor_scrollbars", app->pref_editor_show_scrollbars); - g_key_file_set_integer(config, PACKAGE, "indention_mode", app->pref_editor_indention_mode); + g_key_file_set_boolean(config, PACKAGE, "use_folding", editor_prefs.folding); + g_key_file_set_boolean(config, PACKAGE, "unfold_all_children", editor_prefs.unfold_all_children); + g_key_file_set_boolean(config, PACKAGE, "show_editor_scrollbars", editor_prefs.show_scrollbars); + g_key_file_set_integer(config, PACKAGE, "indention_mode", editor_prefs.indention_mode); g_key_file_set_boolean(config, PACKAGE, "use_tab_to_indent", app->use_tab_to_indent); - g_key_file_set_boolean(config, PACKAGE, "use_indicators", app->pref_editor_use_indicators); - g_key_file_set_boolean(config, PACKAGE, "show_indent_guide", app->pref_editor_show_indent_guide); - g_key_file_set_boolean(config, PACKAGE, "show_white_space", app->pref_editor_show_white_space); + g_key_file_set_boolean(config, PACKAGE, "use_indicators", editor_prefs.use_indicators); + g_key_file_set_boolean(config, PACKAGE, "show_indent_guide", editor_prefs.show_indent_guide); + g_key_file_set_boolean(config, PACKAGE, "show_white_space", editor_prefs.show_white_space); g_key_file_set_boolean(config, PACKAGE, "show_markers_margin", app->show_markers_margin); g_key_file_set_boolean(config, PACKAGE, "show_linenumber_margin", app->show_linenumber_margin); - g_key_file_set_boolean(config, PACKAGE, "line_breaking", app->pref_editor_line_breaking); - g_key_file_set_boolean(config, PACKAGE, "show_line_endings", app->pref_editor_show_line_endings); + g_key_file_set_boolean(config, PACKAGE, "line_breaking", editor_prefs.line_breaking); + g_key_file_set_boolean(config, PACKAGE, "show_line_endings", editor_prefs.show_line_endings); g_key_file_set_boolean(config, PACKAGE, "fullscreen", app->fullscreen); g_key_file_set_boolean(config, PACKAGE, "tab_order_ltr", app->tab_order_ltr); g_key_file_set_boolean(config, PACKAGE, "show_notebook_tabs", app->show_notebook_tabs); g_key_file_set_boolean(config, PACKAGE, "brace_match_ltgt", app->brace_match_ltgt); g_key_file_set_boolean(config, PACKAGE, "switch_msgwin_pages", app->switch_msgwin_pages); - g_key_file_set_boolean(config, PACKAGE, "auto_close_xml_tags", app->pref_editor_auto_close_xml_tags); - g_key_file_set_boolean(config, PACKAGE, "auto_complete_constructs", app->pref_editor_auto_complete_constructs); - g_key_file_set_boolean(config, PACKAGE, "auto_complete_symbols", app->pref_editor_auto_complete_symbols); + g_key_file_set_boolean(config, PACKAGE, "auto_close_xml_tags", editor_prefs.auto_close_xml_tags); + g_key_file_set_boolean(config, PACKAGE, "auto_complete_constructs", editor_prefs.auto_complete_constructs); + g_key_file_set_boolean(config, PACKAGE, "auto_complete_symbols", editor_prefs.auto_complete_symbols); #ifdef HAVE_VTE g_key_file_set_boolean(config, "VTE", "load_vte", vte_info.load_vte); if (vte_info.load_vte && vc != NULL) @@ -239,8 +240,8 @@ gtk_window_get_size(GTK_WINDOW(app->window), &app->geometry[2], &app->geometry[3]); g_key_file_set_integer_list(config, PACKAGE, "geometry", app->geometry, 4); } - g_key_file_set_integer(config, PACKAGE, "pref_editor_tab_width", app->pref_editor_tab_width); - g_key_file_set_boolean(config, PACKAGE, "pref_editor_use_tabs", app->pref_editor_use_tabs); + g_key_file_set_integer(config, PACKAGE, "pref_editor_tab_width", editor_prefs.tab_width); + g_key_file_set_boolean(config, PACKAGE, "pref_editor_use_tabs", editor_prefs.use_tabs); g_key_file_set_boolean(config, PACKAGE, "pref_main_confirm_exit", app->pref_main_confirm_exit); g_key_file_set_boolean(config, PACKAGE, "pref_main_suppress_search_dialogs", app->pref_main_suppress_search_dialogs); g_key_file_set_boolean(config, PACKAGE, "pref_main_load_session", app->pref_main_load_session); @@ -256,11 +257,11 @@ g_key_file_set_boolean(config, PACKAGE, "pref_toolbar_show_quit", app->pref_toolbar_show_quit); g_key_file_set_integer(config, PACKAGE, "pref_toolbar_icon_style", app->toolbar_icon_style); g_key_file_set_integer(config, PACKAGE, "pref_toolbar_icon_size", app->toolbar_icon_size); - g_key_file_set_boolean(config, PACKAGE, "pref_editor_new_line", app->pref_editor_new_line); - g_key_file_set_boolean(config, PACKAGE, "pref_editor_replace_tabs", app->pref_editor_replace_tabs); - g_key_file_set_boolean(config, PACKAGE, "pref_editor_trail_space", app->pref_editor_trail_space); - g_key_file_set_boolean(config, PACKAGE, "pref_editor_disable_dnd", app->pref_editor_disable_dnd); - g_key_file_set_string(config, PACKAGE, "pref_editor_default_encoding", encodings[app->pref_editor_default_encoding].charset); + g_key_file_set_boolean(config, PACKAGE, "pref_editor_new_line", editor_prefs.new_line); + g_key_file_set_boolean(config, PACKAGE, "pref_editor_replace_tabs", editor_prefs.replace_tabs); + g_key_file_set_boolean(config, PACKAGE, "pref_editor_trail_space", editor_prefs.trail_space); + g_key_file_set_boolean(config, PACKAGE, "pref_editor_disable_dnd", editor_prefs.disable_dnd); + g_key_file_set_string(config, PACKAGE, "pref_editor_default_encoding", encodings[editor_prefs.default_encoding].charset); g_key_file_set_string(config, PACKAGE, "pref_template_developer", app->pref_template_developer); g_key_file_set_string(config, PACKAGE, "pref_template_company", app->pref_template_company); g_key_file_set_string(config, PACKAGE, "pref_template_mail", app->pref_template_mail); @@ -382,19 +383,19 @@ app->sidebar_visible = utils_get_setting_boolean(config, PACKAGE, "sidebar_visible", TRUE); app->statusbar_visible = utils_get_setting_boolean(config, PACKAGE, "statusbar_visible", TRUE); app->msgwindow_visible = utils_get_setting_boolean(config, PACKAGE, "msgwindow_visible", TRUE); - app->pref_editor_line_breaking = utils_get_setting_boolean(config, PACKAGE, "line_breaking", FALSE); //default is off for better performance - app->pref_editor_indention_mode = utils_get_setting_integer(config, PACKAGE, "indention_mode", INDENT_ADVANCED); + editor_prefs.line_breaking = utils_get_setting_boolean(config, PACKAGE, "line_breaking", FALSE); //default is off for better performance + editor_prefs.indention_mode = utils_get_setting_integer(config, PACKAGE, "indention_mode", INDENT_ADVANCED); app->use_tab_to_indent = utils_get_setting_boolean(config, PACKAGE, "use_tab_to_indent", FALSE); - app->pref_editor_use_indicators = utils_get_setting_boolean(config, PACKAGE, "use_indicators", TRUE); - app->pref_editor_show_indent_guide = utils_get_setting_boolean(config, PACKAGE, "show_indent_guide", FALSE); - app->pref_editor_show_white_space = utils_get_setting_boolean(config, PACKAGE, "show_white_space", FALSE); - app->pref_editor_show_line_endings = utils_get_setting_boolean(config, PACKAGE, "show_line_endings", FALSE); - app->pref_editor_auto_close_xml_tags = utils_get_setting_boolean(config, PACKAGE, "auto_close_xml_tags", TRUE); - app->pref_editor_auto_complete_constructs = utils_get_setting_boolean(config, PACKAGE, "auto_complete_constructs", TRUE); - app->pref_editor_auto_complete_symbols = utils_get_setting_boolean(config, PACKAGE, "auto_complete_symbols", TRUE); - app->pref_editor_folding = utils_get_setting_boolean(config, PACKAGE, "use_folding", TRUE); - app->pref_editor_unfold_all_children = utils_get_setting_boolean(config, PACKAGE, "unfold_all_children", FALSE); - app->pref_editor_show_scrollbars = utils_get_setting_boolean(config, PACKAGE, "show_editor_scrollbars", TRUE); + editor_prefs.use_indicators = utils_get_setting_boolean(config, PACKAGE, "use_indicators", TRUE); + editor_prefs.show_indent_guide = utils_get_setting_boolean(config, PACKAGE, "show_indent_guide", FALSE); + editor_prefs.show_white_space = utils_get_setting_boolean(config, PACKAGE, "show_white_space", FALSE); + editor_prefs.show_line_endings = utils_get_setting_boolean(config, PACKAGE, "show_line_endings", FALSE); + editor_prefs.auto_close_xml_tags = utils_get_setting_boolean(config, PACKAGE, "auto_close_xml_tags", TRUE); + editor_prefs.auto_complete_constructs = utils_get_setting_boolean(config, PACKAGE, "auto_complete_constructs", TRUE); + editor_prefs.auto_complete_symbols = utils_get_setting_boolean(config, PACKAGE, "auto_complete_symbols", TRUE); + editor_prefs.folding = utils_get_setting_boolean(config, PACKAGE, "use_folding", TRUE); + editor_prefs.unfold_all_children = utils_get_setting_boolean(config, PACKAGE, "unfold_all_children", FALSE); + editor_prefs.show_scrollbars = utils_get_setting_boolean(config, PACKAGE, "show_editor_scrollbars", TRUE); app->show_markers_margin = utils_get_setting_boolean(config, PACKAGE, "show_markers_margin", TRUE); app->show_linenumber_margin = utils_get_setting_boolean(config, PACKAGE, "show_linenumber_margin", TRUE); app->fullscreen = utils_get_setting_boolean(config, PACKAGE, "fullscreen", FALSE); @@ -432,8 +433,8 @@ (GEANY_MSGWIN_HEIGHT + GEANY_WINDOW_DEFAULT_HEIGHT - 440)); - app->pref_editor_tab_width = utils_get_setting_integer(config, PACKAGE, "pref_editor_tab_width", 4); - app->pref_editor_use_tabs = utils_get_setting_boolean(config, PACKAGE, "pref_editor_use_tabs", TRUE); + editor_prefs.tab_width = utils_get_setting_integer(config, PACKAGE, "pref_editor_tab_width", 4); + editor_prefs.use_tabs = utils_get_setting_boolean(config, PACKAGE, "pref_editor_use_tabs", TRUE); // use current locale encoding as default for new files (should be in most cases UTF-8) g_get_charset(&default_charset); tmp_string = utils_get_setting_string(config, PACKAGE, "pref_editor_default_encoding", @@ -442,9 +443,9 @@ { const GeanyEncoding *enc = encodings_get_from_charset(tmp_string); if (enc != NULL) - app->pref_editor_default_encoding = enc->idx; + editor_prefs.default_encoding = enc->idx; else - app->pref_editor_default_encoding = GEANY_ENCODING_UTF_8; + editor_prefs.default_encoding = GEANY_ENCODING_UTF_8; g_free(tmp_string); } @@ -509,10 +510,10 @@ g_free(tmp_string); g_free(tmp_string2); - app->pref_editor_replace_tabs = utils_get_setting_boolean(config, PACKAGE, "pref_editor_replace_tabs", FALSE); - app->pref_editor_new_line = utils_get_setting_boolean(config, PACKAGE, "pref_editor_new_line", TRUE); - app->pref_editor_trail_space = utils_get_setting_boolean(config, PACKAGE, "pref_editor_trail_space", FALSE); - app->pref_editor_disable_dnd = utils_get_setting_boolean(config, PACKAGE, "pref_editor_disable_dnd", FALSE); + editor_prefs.replace_tabs = utils_get_setting_boolean(config, PACKAGE, "pref_editor_replace_tabs", FALSE); + editor_prefs.new_line = utils_get_setting_boolean(config, PACKAGE, "pref_editor_new_line", TRUE); + editor_prefs.trail_space = utils_get_setting_boolean(config, PACKAGE, "pref_editor_trail_space", FALSE); + editor_prefs.disable_dnd = utils_get_setting_boolean(config, PACKAGE, "pref_editor_disable_dnd", FALSE); tmp_string = g_find_program_in_path(GEANY_DEFAULT_TOOLS_MAKE); app->tools_make_cmd = utils_get_setting_string(config, "tools", "make_cmd", tmp_string); Modified: trunk/src/main.c =================================================================== --- trunk/src/main.c 2007-05-29 12:40:43 UTC (rev 1586) +++ trunk/src/main.c 2007-05-29 16:30:54 UTC (rev 1587) @@ -215,10 +215,10 @@ app->ignore_callback = TRUE; gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM( - lookup_widget(app->window, "menu_line_breaking1")), app->pref_editor_line_breaking); + lookup_widget(app->window, "menu_line_breaking1")), editor_prefs.line_breaking); gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM( lookup_widget(app->window, "menu_use_auto_indention1")), - (app->pref_editor_indention_mode != INDENT_NONE)); + (editor_prefs.indention_mode != INDENT_NONE)); app->ignore_callback = FALSE; // connect the toolbar dropdown menu for the new button Modified: trunk/src/prefs.c =================================================================== --- trunk/src/prefs.c 2007-05-29 12:40:43 UTC (rev 1586) +++ trunk/src/prefs.c 2007-05-29 16:30:54 UTC (rev 1587) @@ -43,6 +43,7 @@ #include "interface.h" #include "encodings.h" #include "project.h" +#include "editor.h" #ifdef HAVE_VTE # include "vte.h" @@ -222,61 +223,61 @@ // Editor settings widget = lookup_widget(app->prefs_dialog, "spin_tab_width"); - gtk_spin_button_set_value(GTK_SPIN_BUTTON(widget), app->pref_editor_tab_width); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(widget), editor_prefs.tab_width); widget = lookup_widget(app->prefs_dialog, "combo_encoding"); // luckily the index of the combo box items match the index of the encodings array - gtk_combo_box_set_active(GTK_COMBO_BOX(widget), app->pref_editor_default_encoding); + gtk_combo_box_set_active(GTK_COMBO_BOX(widget), editor_prefs.default_encoding); widget = lookup_widget(app->prefs_dialog, "check_trailing_spaces"); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), app->pref_editor_trail_space); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), editor_prefs.trail_space); widget = lookup_widget(app->prefs_dialog, "check_new_line"); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), app->pref_editor_new_line); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), editor_prefs.new_line); widget = lookup_widget(app->prefs_dialog, "check_replace_tabs"); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), app->pref_editor_replace_tabs); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), editor_prefs.replace_tabs); widget = lookup_widget(app->prefs_dialog, "check_indent"); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), app->pref_editor_show_indent_guide); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), editor_prefs.show_indent_guide); widget = lookup_widget(app->prefs_dialog, "check_white_space"); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), app->pref_editor_show_white_space); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), editor_prefs.show_white_space); widget = lookup_widget(app->prefs_dialog, "check_line_end"); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), app->pref_editor_show_line_endings); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), editor_prefs.show_line_endings); widget = lookup_widget(app->prefs_dialog, "combo_auto_indent_mode"); - gtk_combo_box_set_active(GTK_COMBO_BOX(widget), app->pref_editor_indention_mode); + gtk_combo_box_set_active(GTK_COMBO_BOX(widget), editor_prefs.indention_mode); widget = lookup_widget(app->prefs_dialog, "check_line_wrapping"); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), app->pref_editor_line_breaking); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), editor_prefs.line_breaking); widget = lookup_widget(app->prefs_dialog, "check_auto_complete"); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), app->pref_editor_auto_complete_constructs); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), editor_prefs.auto_complete_constructs); widget = lookup_widget(app->prefs_dialog, "check_xmltag"); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), app->pref_editor_auto_close_xml_tags); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), editor_prefs.auto_close_xml_tags); widget = lookup_widget(app->prefs_dialog, "check_folding"); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), app->pref_editor_folding); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), editor_prefs.folding); widget = lookup_widget(app->prefs_dialog, "check_unfold_children"); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), app->pref_editor_unfold_all_children); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), editor_prefs.unfold_all_children); on_use_folding_toggled(GTK_TOGGLE_BUTTON( lookup_widget(app->prefs_dialog, "check_folding")), NULL); widget = lookup_widget(app->prefs_dialog, "check_disable_dnd"); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), app->pref_editor_disable_dnd); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), editor_prefs.disable_dnd); widget = lookup_widget(app->prefs_dialog, "check_use_tabs"); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), app->pref_editor_use_tabs); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), editor_prefs.use_tabs); widget = lookup_widget(app->prefs_dialog, "check_indicators"); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), app->pref_editor_use_indicators); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), editor_prefs.use_indicators); widget = lookup_widget(app->prefs_dialog, "check_symbol_auto_completion"); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), app->pref_editor_auto_complete_symbols); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), editor_prefs.auto_complete_symbols); on_symbol_auto_completion_toggled(GTK_TOGGLE_BUTTON(widget), NULL); widget = lookup_widget(app->prefs_dialog, "spin_autocheight"); @@ -546,62 +547,62 @@ // Editor settings widget = lookup_widget(app->prefs_dialog, "spin_tab_width"); - app->pref_editor_tab_width = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget)); + editor_prefs.tab_width = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget)); widget = lookup_widget(app->prefs_dialog, "combo_encoding"); - app->pref_editor_default_encoding = gtk_combo_box_get_active(GTK_COMBO_BOX(widget)); + editor_prefs.default_encoding = gtk_combo_box_get_active(GTK_COMBO_BOX(widget)); widget = lookup_widget(app->prefs_dialog, "check_trailing_spaces"); - app->pref_editor_trail_space = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + editor_prefs.trail_space = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); widget = lookup_widget(app->prefs_dialog, "check_new_line"); - app->pref_editor_new_line = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + editor_prefs.new_line = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); widget = lookup_widget(app->prefs_dialog, "check_replace_tabs"); - app->pref_editor_replace_tabs = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + editor_prefs.replace_tabs = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); widget = lookup_widget(app->prefs_dialog, "spin_long_line"); app->long_line_column = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget)); widget = lookup_widget(app->prefs_dialog, "check_folding"); - app->pref_editor_folding = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + editor_prefs.folding = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); ui_update_fold_items(); widget = lookup_widget(app->prefs_dialog, "check_unfold_children"); - app->pref_editor_unfold_all_children = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + editor_prefs.unfold_all_children = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); widget = lookup_widget(app->prefs_dialog, "check_indent"); - app->pref_editor_show_indent_guide = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + editor_prefs.show_indent_guide = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); widget = lookup_widget(app->prefs_dialog, "check_white_space"); - app->pref_editor_show_white_space = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + editor_prefs.show_white_space = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); widget = lookup_widget(app->prefs_dialog, "check_line_end"); - app->pref_editor_show_line_endings = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + editor_prefs.show_line_endings = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); widget = lookup_widget(app->prefs_dialog, "combo_auto_indent_mode"); - app->pref_editor_indention_mode = gtk_combo_box_get_active(GTK_COMBO_BOX(widget)); + editor_prefs.indention_mode = gtk_combo_box_get_active(GTK_COMBO_BOX(widget)); widget = lookup_widget(app->prefs_dialog, "check_line_wrapping"); - app->pref_editor_line_breaking = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + editor_prefs.line_breaking = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); widget = lookup_widget(app->prefs_dialog, "check_auto_complete"); - app->pref_editor_auto_complete_constructs = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + editor_prefs.auto_complete_constructs = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); widget = lookup_widget(app->prefs_dialog, "check_xmltag"); - app->pref_editor_auto_close_xml_tags = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + editor_prefs.auto_close_xml_tags = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); widget = lookup_widget(app->prefs_dialog, "check_indicators"); - app->pref_editor_use_indicators = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + editor_prefs.use_indicators = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); widget = lookup_widget(app->prefs_dialog, "check_disable_dnd"); - app->pref_editor_disable_dnd = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + editor_prefs.disable_dnd = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); widget = lookup_widget(app->prefs_dialog, "check_use_tabs"); - app->pref_editor_use_tabs = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + editor_prefs.use_tabs = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); widget = lookup_widget(app->prefs_dialog, "check_symbol_auto_completion"); - app->pref_editor_auto_complete_symbols = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + editor_prefs.auto_complete_symbols = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); widget = lookup_widget(app->prefs_dialog, "spin_autocheight"); app->autocompletion_max_height = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget)); @@ -709,7 +710,7 @@ if (doc_list[i].is_valid) { document_apply_update_prefs(i); - if (! app->pref_editor_folding) + if (! editor_prefs.folding) document_unfold_all(i); } } Modified: trunk/src/ui_utils.c =================================================================== --- trunk/src/ui_utils.c 2007-05-29 12:40:43 UTC (rev 1586) +++ trunk/src/ui_utils.c 2007-05-29 16:30:54 UTC (rev 1587) @@ -41,6 +41,7 @@ #include "treeviews.h" #include "win32.h" #include "project.h" +#include "editor.h" static gchar *menu_item_get_text(GtkMenuItem *menu_item); @@ -325,8 +326,8 @@ void ui_update_fold_items() { - gtk_widget_set_sensitive(lookup_widget(app->window, "menu_fold_all1"), app->pref_editor_folding); - gtk_widget_set_sensitive(lookup_widget(app->window, "menu_unfold_all1"), app->pref_editor_folding); + gtk_widget_set_sensitive(lookup_widget(app->window, "menu_fold_all1"), editor_prefs.folding); + gtk_widget_set_sensitive(lookup_widget(app->window, "menu_unfold_all1"), editor_prefs.folding); } @@ -593,7 +594,7 @@ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(lookup_widget(app->window, widget_name)), TRUE); - gtk_widget_set_sensitive(indention, app->pref_editor_indention_mode != INDENT_NONE); + gtk_widget_set_sensitive(indention, editor_prefs.indention_mode != INDENT_NONE); gtk_widget_set_sensitive(lookup_widget(app->window, "menu_write_unicode_bom1"), encodings_is_unicode_charset(doc_list[idx].encoding)); Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2007-05-29 12:40:43 UTC (rev 1586) +++ trunk/src/utils.c 2007-05-29 16:30:54 UTC (rev 1587) @@ -1463,39 +1463,6 @@ } -/* Returns a string containing whitespace of the amount a according to the - * setting app->pref_editor_use_tabs filled with simple space characters or with the right amount - * of tabulator characters (a is filled with tabulators *and* spaces if a isn't a multiple of - * app->pref_editor_tab_width). - * If alternative is set to TRUE, it returns the opposite of app->pref_editor_use_tabs. */ -gchar *utils_get_whitespace(gint a, gboolean alternative) -{ - gchar *str; - gboolean use_tabs; - - g_return_val_if_fail(a > 0, NULL); - - use_tabs = (alternative) ? ! app->pref_editor_use_tabs : app->pref_editor_use_tabs; - - if (use_tabs) - { // first fill text with tabluators and fill the rest with spaces - gint tabs = a / app->pref_editor_tab_width; - gint spaces = a % app->pref_editor_tab_width; - gint len = tabs + spaces; - - str = g_malloc(len + 1); - - memset(str, '\t', tabs); - memset(str + tabs, ' ', spaces); - str[len] = '\0'; - } - else - str = g_strnfill(a, ' '); - - return str; -} - - /* Frees all passed pointers if they are non-NULL, the first argument is nothing special, * it will also be freed, the list should be ended with NULL */ void utils_free_pointers(gpointer first, ...) Modified: trunk/src/utils.h =================================================================== --- trunk/src/utils.h 2007-05-29 12:40:43 UTC (rev 1586) +++ trunk/src/utils.h 2007-05-29 16:30:54 UTC (rev 1587) @@ -25,6 +25,10 @@ #ifndef GEANY_UTILS_H #define GEANY_UTILS_H 1 +#if ! GLIB_CHECK_VERSION(2, 8, 0) +#define G_GNUC_NULL_TERMINATED +#endif + // Returns: TRUE if ptr points to a non-zero value. #define NZV(ptr) \ ((ptr) && (ptr)[0]) @@ -159,18 +163,7 @@ /* Simple wrapper for g_locale_to_utf8; returns a copy of locale_text on failure. */ gchar *utils_get_utf8_from_locale(const gchar *locale_text); -/* Returns a string containing whitespace of the amount a according to the - * setting app->pref_editor_use_tabs filled with simple space characters or with the right amount - * of tabulator characters (a is filled with tabulators *and* spaces if a isn't a multiple of - * app->pref_editor_tab_width). - * If alternative is set to TRUE, it returns the opposite of app->pref_editor_use_tabs. */ -gchar *utils_get_whitespace(gint amount, gboolean alternative); - -#if ! GLIB_CHECK_VERSION(2, 8, 0) -#define G_GNUC_NULL_TERMINATED -#endif - /* Frees all passed pointers if they are non-NULL, the first argument is nothing special, * it will also be freed, the list should be ended with NULL */ void utils_free_pointers(gpointer first, ...) G_GNUC_NULL_TERMINATED; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1586] trunk/doc/geany.docbook
by eht16＠users.sourceforge.net 29 May '07

29 May '07

Revision: 1586 http://svn.sourceforge.net/geany/?rev=1586&view=rev Author: eht16 Date: 2007-05-29 05:40:43 -0700 (Tue, 29 May 2007) Log Message: ----------- Oops, change default browser to firefox. Modified Paths: -------------- trunk/doc/geany.docbook Modified: trunk/doc/geany.docbook =================================================================== --- trunk/doc/geany.docbook 2007-05-29 12:35:28 UTC (rev 1585) +++ trunk/doc/geany.docbook 2007-05-29 12:40:43 UTC (rev 1586) @@ -2667,7 +2667,7 @@ <row> <entry>GEANY_DEFAULT_TOOLS_BROWSER</entry> <entry>A web browser. This can also include a path.</entry> - <entry>"mozilla"</entry> + <entry>"firefox"</entry> </row> <row> <entry>GEANY_DEFAULT_TOOLS_PRINTCMD</entry> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1585] trunk
by eht16＠users.sourceforge.net 29 May '07

29 May '07

Revision: 1585 http://svn.sourceforge.net/geany/?rev=1585&view=rev Author: eht16 Date: 2007-05-29 05:35:28 -0700 (Tue, 29 May 2007) Log Message: ----------- Updated TODO. Removed app_small entity. Added description for global configuration file. Modified Paths: -------------- trunk/ChangeLog trunk/TODO trunk/doc/geany.docbook Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-05-28 16:07:30 UTC (rev 1584) +++ trunk/ChangeLog 2007-05-29 12:35:28 UTC (rev 1585) @@ -1,3 +1,10 @@ +2007-05-29 Enrico Tröger <enrico.troeger(a)uvena.de> + + * doc/geany.docbook: + Removed app_small entity. + Added description for global configuration file. + + 2007-05-28 Nick Treleaven <nick.treleaven(a)btinternet.com> * src/project.c, src/document.c, src/ui_utils.c: Modified: trunk/TODO =================================================================== --- trunk/TODO 2007-05-28 16:07:30 UTC (rev 1584) +++ trunk/TODO 2007-05-29 12:35:28 UTC (rev 1585) @@ -6,9 +6,9 @@ Next version or later: o fix bug that prevents UTF-16, UTF-32 files from being loaded. + o tagmanager fails on UTF-16/32 o make calltips show full function signature for C-like files (e.g. return type with const, [] for D, etc.) - o Go to xxx - definable command o documentation: list and explain filetype modes o documentation: preferences o user-definable construct completion Modified: trunk/doc/geany.docbook =================================================================== --- trunk/doc/geany.docbook 2007-05-28 16:07:30 UTC (rev 1584) +++ trunk/doc/geany.docbook 2007-05-29 12:35:28 UTC (rev 1585) @@ -1,8 +1,7 @@ <?xml version='1.0' encoding='UTF-8'?> <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ -<!ENTITY app_small "geany"> -<!ENTITY appversion "0.11"> +<!ENTITY appversion "0.12"> <!ENTITY appurl "http://geany.uvena.de"> <!ENTITY author_mail "enrico.troeger(a)uvena.de"> <!ENTITY date "May 21, 2007"> @@ -148,38 +147,10 @@ </section> <section id="binary_packages"> <title>Binary packages</title> - <section> - <title>Fedora</title> - <para> - You can use the Fedora Core 4 repository from - <ulink url="http://naturidentisch.de/packages/fc4/">http://naturidentisch.de/packages/fc4/</ulink>. - </para> - <para> - You can also use the Fedora Core 5 repository from - <ulink url="http://naturidentisch.de/packages/fc5/">http://naturidentisch.de/packages/fc5/</ulink>. - </para> - </section> - <section> - <title>Debian</title> - <para> - <application>Geany</application> is available through the official Debian archives. - </para> - <para> - <command>apt-get install geany</command> - </para> - </section> - <section> - <title>SuSE</title> - <para> - Packages for SuSE are not yet available. - </para> - </section> - <section> - <title>Gentoo</title> - <para> - An ebuild for Gentoo can be found on <ulink url="https://bugs.gentoo.org/show_bug.cgi?id=114815">http://bugs.gentoo.de</ulink>. - </para> - </section> + <para> + There are many binary packages available. For an up to date but maybe incomplete + list see <ulink url="&appurl;/Download/Releases">&appurl;/Download/Releases</ulink>. + </para> </section> </chapter> @@ -210,7 +181,7 @@ To start <application>Geany</application> from a command line, type the following and press <keycap>Return</keycap>: <screen> - <prompt>%</prompt> <userinput><command>&app_small;</command></userinput></screen> + <prompt>%</prompt> <userinput><command>geany</command></userinput></screen> </para> </listitem> </itemizedlist> @@ -245,8 +216,8 @@ <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 + configuration directory is <filename>~/.geany/</filename> + and there resides <filename>geany.conf</filename> and other configuration files. </entry> </row> @@ -1898,6 +1869,31 @@ <chapter id="config_files"> <title>Configuration files</title> + <section id="global_config"> + <title>Global configuration file</title> + <para> + You can use a global configuration file for <application>Geany</application> which + will be used if the user starts <application>Geany</application> for the first + time and an user's configuration file was not yet created or in case an user + deleted the configuration file to use default values. + </para> + <para> + The global configuration file is read from + <filename>$prefix/share/geany/geany.conf</filename> (where $prefix is the path where + <application>Geany</application> is installed) when starting + <application>Geany</application> and an user configuration file does not exist. It + can contain any settings which are found in the usual configuration file created by + <application>Geany</application> but does not have to contain all settings. + </para> + <note> + <para> + This feature is mainly intended for package maintainers or system admins who + want to set up <application>Geany</application> in a multi user environment + and set some sane default values for this environment. Usual users won't need + to do that. + </para> + </note> + </section> <section id="filetypes"> <title>Filetype definition files</title> <para> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1584] trunk
by ntrel＠users.sourceforge.net 28 May '07

28 May '07

Revision: 1584 http://svn.sourceforge.net/geany/?rev=1584&view=rev Author: ntrel Date: 2007-05-28 09:07:30 -0700 (Mon, 28 May 2007) Log Message: ----------- Rename sci_cb.[hc] editor.[hc]. Modified Paths: -------------- trunk/ChangeLog trunk/po/POTFILES.in trunk/src/Makefile.am trunk/src/callbacks.c trunk/src/document.c trunk/src/highlighting.c trunk/src/keybindings.c trunk/src/main.c trunk/src/makefile.win32 trunk/src/search.c Added Paths: ----------- trunk/src/editor.c trunk/src/editor.h Removed Paths: ------------- trunk/src/sci_cb.c trunk/src/sci_cb.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-05-28 15:28:30 UTC (rev 1583) +++ trunk/ChangeLog 2007-05-28 16:07:30 UTC (rev 1584) @@ -4,6 +4,11 @@ Show current project name in window title. * configure.in, src/Makefile.am: Force debug mode for a SVN working copy. + * src/highlighting.c, src/keybindings.c, src/makefile.win32, + src/callbacks.c, src/sci_cb.c, src/sci_cb.h, src/search.c, + src/document.c, src/main.c, src/editor.c, src/Makefile.am, + src/editor.h, po/POTFILES.in: + Rename sci_cb.[hc] editor.[hc]. 2007-05-26 Nick Treleaven <nick.treleaven(a)btinternet.com> Modified: trunk/po/POTFILES.in =================================================================== --- trunk/po/POTFILES.in 2007-05-28 15:28:30 UTC (rev 1583) +++ trunk/po/POTFILES.in 2007-05-28 16:07:30 UTC (rev 1584) @@ -18,7 +18,7 @@ src/notebook.c src/prefs.c src/project.c -src/sci_cb.c +src/editor.c src/sciwrappers.c src/search.c src/socket.c Modified: trunk/src/Makefile.am =================================================================== --- trunk/src/Makefile.am 2007-05-28 15:28:30 UTC (rev 1583) +++ trunk/src/Makefile.am 2007-05-28 16:07:30 UTC (rev 1584) @@ -23,7 +23,7 @@ notebook.c notebook.h \ prefs.c prefs.h \ project.c project.h \ - sci_cb.c sci_cb.h \ + editor.c editor.h \ sciwrappers.c sciwrappers.h \ search.c search.h \ socket.c socket.h \ Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2007-05-28 15:28:30 UTC (rev 1583) +++ trunk/src/callbacks.c 2007-05-28 16:07:30 UTC (rev 1584) @@ -41,7 +41,7 @@ #include "keyfile.h" #include "document.h" #include "sciwrappers.h" -#include "sci_cb.h" +#include "editor.h" #include "ui_utils.h" #include "utils.h" #include "dialogs.h" @@ -1249,7 +1249,7 @@ if (idx == -1 || ! doc_list[idx].is_valid) return; - sci_cb_find_current_word(doc_list[idx].sci, pos, colour, sizeof colour, NULL); + editor_find_current_word(doc_list[idx].sci, pos, colour, sizeof colour, NULL); dialogs_show_color(colour); } @@ -1477,7 +1477,7 @@ verify_click_pos(idx); // make sure that the click_pos is valid - sci_cb_insert_multiline_comment(idx); + editor_insert_multiline_comment(idx); } @@ -1829,7 +1829,7 @@ { gint idx = document_get_cur_idx(); if (idx == -1 || ! doc_list[idx].is_valid) return; - sci_cb_do_comment(idx, -1, FALSE); + editor_do_comment(idx, -1, FALSE); } @@ -1839,7 +1839,7 @@ { gint idx = document_get_cur_idx(); if (idx == -1 || ! doc_list[idx].is_valid) return; - sci_cb_do_uncomment(idx, -1); + editor_do_uncomment(idx, -1); } @@ -1850,7 +1850,7 @@ { gint idx = document_get_cur_idx(); if (idx == -1 || ! doc_list[idx].is_valid) return; - sci_cb_do_comment_toggle(idx); + editor_do_comment_toggle(idx); } @@ -2067,7 +2067,7 @@ { // use the word at current cursor position gchar word[GEANY_MAX_WORD_LENGTH]; - sci_cb_find_current_word(doc_list[idx].sci, -1, word, sizeof(word), GEANY_WORDCHARS"./"); + editor_find_current_word(doc_list[idx].sci, -1, word, sizeof(word), GEANY_WORDCHARS"./"); if (word[0] != '\0') filename = g_strdup(word); } Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2007-05-28 15:28:30 UTC (rev 1583) +++ trunk/src/document.c 2007-05-28 16:07:30 UTC (rev 1584) @@ -53,7 +53,7 @@ #include "document.h" #include "support.h" #include "sciwrappers.h" -#include "sci_cb.h" +#include "editor.h" #include "dialogs.h" #include "msgwindow.h" #include "templates.h" @@ -1571,14 +1571,14 @@ guint n; const GString *s; - if (sci != NULL && sci_cb_lexer_get_type_keyword_idx(sci_get_lexer(sci)) == -1) + if (sci != NULL && editor_lexer_get_type_keyword_idx(sci_get_lexer(sci)) == -1) return FALSE; if (! get_project_typenames(&s)) { // typenames have not changed if (s != NULL && sci != NULL) { - gint keyword_idx = sci_cb_lexer_get_type_keyword_idx(sci_get_lexer(sci)); + gint keyword_idx = editor_lexer_get_type_keyword_idx(sci_get_lexer(sci)); sci_set_keywords(sci, keyword_idx, s->str); if (! delay_colourise) @@ -1596,7 +1596,7 @@ if (wid) { - gint keyword_idx = sci_cb_lexer_get_type_keyword_idx(sci_get_lexer(wid)); + gint keyword_idx = editor_lexer_get_type_keyword_idx(sci_get_lexer(wid)); if (keyword_idx > 0) { @@ -2214,7 +2214,7 @@ n = g_array_index(doc_indexes, gint, i); sci = doc_list[n].sci; - if (! recolour || (sci && sci_cb_lexer_get_type_keyword_idx(sci_get_lexer(sci)) == -1)) + if (! recolour || (sci && editor_lexer_get_type_keyword_idx(sci_get_lexer(sci)) == -1)) { doc_set[n] = FALSE; } Copied: trunk/src/editor.c (from rev 1583, trunk/src/sci_cb.c) =================================================================== --- trunk/src/editor.c (rev 0) +++ trunk/src/editor.c 2007-05-28 16:07:30 UTC (rev 1584) @@ -0,0 +1,2296 @@ +/* + * editor.c - this file is part of Geany, a fast and lightweight IDE + * + * Copyright 2005-2007 Enrico Tröger <enrico.troeger(a)uvena.de> + * Copyright 2006-2007 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., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * $Id$ + */ + +/* + * Callbacks for the Scintilla widget (ScintillaObject). + * Most important is the sci-notify callback, handled in on_editor_notification(). + * This includes auto-indentation, comments, auto-completion, calltips, etc. + * Also some general Scintilla-related functions. + */ + +#include <ctype.h> +#include <string.h> + +#include "SciLexer.h" +#include "geany.h" + +#include "editor.h" +#include "document.h" +#include "sciwrappers.h" +#include "ui_utils.h" +#include "utils.h" +#include "symbols.h" + + +static gchar current_word[GEANY_MAX_WORD_LENGTH]; // holds word under the mouse or keyboard cursor + +EditorInfo editor_info = {current_word, -1}; + +static struct +{ + gchar *text; + gboolean set; + gchar *last_word; + guint tag_index; +} calltip = {NULL, FALSE, NULL, 0}; + +static gchar indent[100]; + + +static void on_new_line_added(ScintillaObject *sci, gint idx); +static gboolean handle_xml(ScintillaObject *sci, gchar ch, gint idx); +static void get_indent(ScintillaObject *sci, gint pos, gboolean use_this_line); +static void auto_multiline(ScintillaObject *sci, gint pos); +static gboolean is_comment(gint lexer, gint style); +static void scroll_to_line(ScintillaObject *sci, gint line, gfloat percent_of_view); +static void auto_close_bracket(ScintillaObject *sci, gint pos, gchar c); + + +// calls the edit popup menu in the editor +gboolean +on_editor_button_press_event (GtkWidget *widget, + GdkEventButton *event, + gpointer user_data) +{ + gint idx = GPOINTER_TO_INT(user_data); + editor_info.click_pos = sci_get_position_from_xy(doc_list[idx].sci, event->x, event->y, FALSE); + + if (event->button == 1) + { + if (GDK_BUTTON_PRESS==event->type && app->pref_editor_disable_dnd) + { + gint ss = sci_get_selection_start(doc_list[idx].sci); + sci_set_selection_end(doc_list[idx].sci, ss); + } + return utils_check_disk_status(idx, FALSE); + } + + if (event->button == 3) + { + editor_find_current_word(doc_list[idx].sci, editor_info.click_pos, + current_word, sizeof current_word, NULL); + + ui_update_popup_goto_items((current_word[0] != '\0') ? TRUE : FALSE); + ui_update_popup_copy_items(idx); + ui_update_insert_include_item(idx, 0); + gtk_menu_popup(GTK_MENU(app->popup_menu), NULL, NULL, NULL, NULL, event->button, event->time); + + return TRUE; + } + return FALSE; +} + + +typedef struct SCNotification SCNotification; + +static void on_margin_click(ScintillaObject *sci, SCNotification *nt) +{ + // left click to marker margin marks the line + if (nt->margin == 1) + { + gint line = sci_get_line_from_position(sci, nt->position); + gboolean set = sci_is_marker_set_at_line(sci, line, 1); + + //sci_marker_delete_all(doc_list[idx].sci, 1); + sci_set_marker_at_line(sci, line, ! set, 1); // toggle the marker + } + // left click on the folding margin to toggle folding state of current line + else if (nt->margin == 2 && app->pref_editor_folding) + { + gint line = SSM(sci, SCI_LINEFROMPOSITION, nt->position, 0); + + SSM(sci, SCI_TOGGLEFOLD, line, 0); + if (app->pref_editor_unfold_all_children && + SSM(sci, SCI_GETLINEVISIBLE, line + 1, 0)) + { // unfold all children of the current fold point + gint last_line = SSM(sci, SCI_GETLASTCHILD, line, -1); + gint i; + + for (i = line; i < last_line; i++) + { + if (! SSM(sci, SCI_GETLINEVISIBLE, i, 0)) + { + SSM(sci, SCI_TOGGLEFOLD, SSM(sci, SCI_GETFOLDPARENT, i, 0), 0); + } + } + } + } +} + + +static void on_update_ui(gint idx, G_GNUC_UNUSED SCNotification *nt) +{ + ScintillaObject *sci = doc_list[idx].sci; + gint pos = sci_get_current_position(sci); + + // undo / redo menu update + ui_update_popup_reundo_items(idx); + + // brace highlighting + editor_highlight_braces(sci, pos); + + ui_update_statusbar(idx, pos); + + /* Visible lines are only laid out accurately once [SCN_UPDATEUI] is sent, + * so we need to only call sci_scroll_to_line here, because the document + * may have line wrapping and folding enabled. + * http://scintilla.sourceforge.net/ScintillaDoc.html#LineWrapping */ + if (doc_list[idx].scroll_percent > 0.0F) + { + scroll_to_line(sci, -1, doc_list[idx].scroll_percent); + doc_list[idx].scroll_percent = -1.0F; // disable further scrolling + } +#if 0 + /// experimental code for inverting selections + { + gint i; + for (i = SSM(sci, SCI_GETSELECTIONSTART, 0, 0); i < SSM(sci, SCI_GETSELECTIONEND, 0, 0); i++) + { + // need to get colour from getstyleat(), but how? + SSM(sci, SCI_STYLESETFORE, STYLE_DEFAULT, 0); + SSM(sci, SCI_STYLESETBACK, STYLE_DEFAULT, 0); + } + + sci_get_style_at(sci, pos); + } +#endif +} + + +static void on_char_added(gint idx, SCNotification *nt) +{ + ScintillaObject *sci = doc_list[idx].sci; + gint pos = sci_get_current_position(sci); + + switch (nt->ch) + { + case '\r': + { // simple indentation (only for CR format) + if (sci_get_eol_mode(sci) == SC_EOL_CR) + on_new_line_added(sci, idx); + break; + } + case '\n': + { // simple indentation (for CR/LF and LF format) + on_new_line_added(sci, idx); + break; + } + case '>': + case '/': + { // close xml-tags + handle_xml(sci, nt->ch, idx); + break; + } + case '(': + { // show calltips + editor_show_calltip(idx, --pos); + break; + } + case ')': + { // hide calltips + if (SSM(sci, SCI_CALLTIPACTIVE, 0, 0)) + { + SSM(sci, SCI_CALLTIPCANCEL, 0, 0); + } + g_free(calltip.text); + calltip.text = NULL; + calltip.set = FALSE; + break; + } + case '[': + case '{': + { // Tex auto-closing + if (sci_get_lexer(sci) == SCLEX_LATEX) + { + auto_close_bracket(sci, pos, nt->ch); // Tex auto-closing + editor_show_calltip(idx, --pos); + } + break; + } + case '}': + { // closing bracket handling + if (doc_list[idx].use_auto_indention && + app->pref_editor_indention_mode == INDENT_ADVANCED) + editor_close_block(idx, pos - 1); + break; + } + default: editor_start_auto_complete(idx, pos, FALSE); + } +} + + +// callback func called by all editors when a signal arises +void on_editor_notification(GtkWidget *editor, gint scn, gpointer lscn, gpointer user_data) +{ + SCNotification *nt; + ScintillaObject *sci; + gint idx; + + idx = GPOINTER_TO_INT(user_data); + sci = doc_list[idx].sci; + + nt = lscn; + switch (nt->nmhdr.code) + { + case SCN_SAVEPOINTLEFT: + { + doc_list[idx].changed = TRUE; + document_set_text_changed(idx); + break; + } + case SCN_SAVEPOINTREACHED: + { + doc_list[idx].changed = FALSE; + document_set_text_changed(idx); + break; + } + case SCN_MODIFYATTEMPTRO: + { + utils_beep(); + break; + } + case SCN_MARGINCLICK: + on_margin_click(sci, nt); + break; + + case SCN_UPDATEUI: + on_update_ui(idx, nt); + break; + + case SCN_MODIFIED: + { + if (nt->modificationType & SC_STARTACTION && ! app->ignore_callback) + { + // get notified about undo changes + document_undo_add(idx, UNDO_SCINTILLA, NULL); + } + break; + } + case SCN_CHARADDED: + on_char_added(idx, nt); + break; + + case SCN_USERLISTSELECTION: + { + if (nt->listType == 1) + { + gint pos = SSM(sci, SCI_GETCURRENTPOS, 0, 0); + SSM(sci, SCI_INSERTTEXT, pos, (sptr_t) nt->text); + } + else if (nt->listType == 2) + { + gint start, pos = SSM(sci, SCI_GETCURRENTPOS, 0, 0); + start = pos; + while (start > 0 && sci_get_char_at(sci, --start) != '&') ; + + SSM(sci, SCI_INSERTTEXT, pos - 1, (sptr_t) nt->text); + } + break; + } + case SCN_AUTOCSELECTION: + { + // now that autocomplete is finishing, reshow calltips if they were showing + if (calltip.set) + { + gint pos = sci_get_current_position(sci); + SSM(sci, SCI_CALLTIPSHOW, pos, (sptr_t) calltip.text); + // now autocompletion has been cancelled, so do it manually + sci_set_selection_start(sci, nt->lParam); + sci_set_selection_end(sci, pos); + sci_replace_sel(sci, ""); // clear root of word + SSM(sci, SCI_INSERTTEXT, nt->lParam, (sptr_t) nt->text); + sci_goto_pos(sci, nt->lParam + strlen(nt->text), FALSE); + } + break; + } +#ifdef GEANY_DEBUG + case SCN_STYLENEEDED: + { + geany_debug("style"); + break; + } +#endif + case SCN_URIDROPPED: + { + if (nt->text != NULL) + { + document_open_file_list(nt->text, -1); + } + break; + } + case SCN_CALLTIPCLICK: + { + if (nt->position > 0) + { + switch (nt->position) + { + case 1: // up arrow + if (calltip.tag_index > 0) + calltip.tag_index--; + break; + + case 2: calltip.tag_index++; break; // down arrow + } + editor_show_calltip(idx, -1); + } + break; + } + } +} + + +static void on_new_line_added(ScintillaObject *sci, gint idx) +{ + gint pos = sci_get_current_position(sci); + + // simple indentation + if (doc_list[idx].use_auto_indention) + { + get_indent(sci, pos, FALSE); + sci_add_text(sci, indent); + + if (app->pref_editor_indention_mode == INDENT_ADVANCED) + { + // add extra indentation for Python after colon + if (FILETYPE_ID(doc_list[idx].file_type) == GEANY_FILETYPES_PYTHON && + sci_get_char_at(sci, pos - 2) == ':' && + sci_get_style_at(sci, pos - 2) == SCE_P_OPERATOR) + { + // creates and inserts one tabulator sign or whitespace of the amount of the tab width + gchar *text = utils_get_whitespace(app->pref_editor_tab_width, FALSE); + sci_add_text(sci, text); + g_free(text); + } + } + } + + if (app->pref_editor_auto_complete_constructs) + { + // " * " auto completion in multiline C/C++/D/Java comments + auto_multiline(sci, pos); + + editor_auto_latex(idx, pos); + } +} + + +static gboolean lexer_has_braces(ScintillaObject *sci) +{ + gint lexer = SSM(sci, SCI_GETLEXER, 0, 0); + + switch (lexer) + { + case SCLEX_CPP: + case SCLEX_D: + case SCLEX_HTML: // for PHP & JS + case SCLEX_PASCAL: // for multiline comments? + case SCLEX_BASH: + case SCLEX_PERL: + case SCLEX_TCL: + return TRUE; + default: + return FALSE; + } +} + + +// in place indentation of one tab or equivalent spaces +static void do_indent(gchar *buf, gsize len, guint *idx) +{ + guint j = *idx; + + if (app->pref_editor_use_tabs) + { + if (j < len - 1) // leave room for a \0 terminator. + buf[j++] = '\t'; + } + else + { // insert as many spaces as a tab would take + guint k; + for (k = 0; k < (guint) app->pref_editor_tab_width && k < len - 1; k++) + buf[j++] = ' '; + } + *idx = j; +} + + +/* "use_this_line" to auto-indent only if it is a real new line + * and ignore the case of editor_close_block */ +static void get_indent(ScintillaObject *sci, gint pos, gboolean use_this_line) +{ + guint i, len, j = 0; + gint prev_line; + gchar *linebuf; + + prev_line = sci_get_line_from_position(sci, pos); + + if (! use_this_line) prev_line--; + len = sci_get_line_length(sci, prev_line); + linebuf = sci_get_line(sci, prev_line); + + for (i = 0; i < len && j <= (sizeof(indent) - 1); i++) + { + if (linebuf[i] == ' ' || linebuf[i] == '\t') // simple indentation + indent[j++] = linebuf[i]; + else if (app->pref_editor_indention_mode != INDENT_ADVANCED) + break; + else if (use_this_line) + break; + else // editor_close_block + { + if (! lexer_has_braces(sci)) + break; + + if (linebuf[i] == '{') + { + do_indent(indent, sizeof(indent), &j); + break; + } + else + { + gint k = len - 1; + + while (k > 0 && isspace(linebuf[k])) k--; + + // if last non-whitespace character is a { increase indentation by a tab + // e.g. for (...) { + if (linebuf[k] == '{') + { + do_indent(indent, sizeof(indent), &j); + } + break; + } + } + } + indent[j] = '\0'; + g_free(linebuf); +} + + +static void auto_close_bracket(ScintillaObject *sci, gint pos, gchar c) +{ + if (! app->pref_editor_auto_complete_constructs || SSM(sci, SCI_GETLEXER, 0, 0) != SCLEX_LATEX) + return; + + if (c == '[') + { + sci_add_text(sci, "]"); + } + else if (c == '{') + { + sci_add_text(sci, "}"); + } + sci_set_current_position(sci, pos, TRUE); +} + + +/* Finds a corresponding matching brace to the given pos + * (this is taken from Scintilla Editor.cxx, + * fit to work with editor_close_block) */ +static gint brace_match(ScintillaObject *sci, gint pos) +{ + gchar chBrace = sci_get_char_at(sci, pos); + gchar chSeek = utils_brace_opposite(chBrace); + gchar chAtPos; + gint direction = -1; + gint styBrace; + gint depth = 1; + gint styAtPos; + + styBrace = sci_get_style_at(sci, pos); + + if (utils_is_opening_brace(chBrace)) + direction = 1; + + pos = pos + direction; + while ((pos >= 0) && (pos < sci_get_length(sci))) + { + chAtPos = sci_get_char_at(sci, pos - 1); + styAtPos = sci_get_style_at(sci, pos); + + if ((pos > sci_get_end_styled(sci)) || (styAtPos == styBrace)) + { + if (chAtPos == chBrace) + depth++; + if (chAtPos == chSeek) + depth--; + if (depth == 0) + return pos; + } + pos = pos + direction; + } + return -1; +} + + +/* Called after typing '}', if pref_editor_indention_mode is INDENT_ADVANCED. */ +void editor_close_block(gint idx, gint pos) +{ + gint x = 0, cnt = 0; + gint start_brace, line, line_len, eol_char_len; + gchar *text, *line_buf; + ScintillaObject *sci; + + if (idx == -1 || ! doc_list[idx].is_valid || doc_list[idx].file_type == NULL) return; + + sci = doc_list[idx].sci; + + if (! lexer_has_braces(sci)) + return; + + line = sci_get_line_from_position(sci, pos); + line_len = sci_get_line_length(sci, line); + // set eol_char_len to 0 if on last line, because there is no EOL char + eol_char_len = (line == (SSM(sci, SCI_GETLINECOUNT, 0, 0) - 1)) ? 0 : + 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 = sci_get_line(sci, line); + line_buf[line_len - eol_char_len] = '\0'; + while (x < (line_len - eol_char_len)) + { + if (isspace(line_buf[x])) cnt++; + x++; + } + g_free(line_buf); + + if ((line_len - eol_char_len - 1) != cnt) return; + + start_brace = brace_match(sci, pos); // same as sci_find_bracematch (Document::BraceMatch)? + + if (start_brace >= 0) + { + gint line_start; + + get_indent(sci, start_brace, TRUE); + text = g_strconcat(indent, "}", NULL); + line_start = sci_get_position_from_line(sci, line); + sci_set_anchor(sci, line_start); + SSM(sci, SCI_REPLACESEL, 0, (sptr_t) text); + g_free(text); + } + else + if (sci_get_lexer(sci) == SCLEX_HTML || sci_get_lexer(sci) == SCLEX_TCL) + { /* For TCL & PHP brace_match doesn't work here (maybe lexer bugs?), + * so this is a simple workaround. */ + gint line_indent = sci_get_line_indentation(sci, line); + gint last_indent = sci_get_line_indentation(sci, line - 1); + + if (line_indent < last_indent) + return; + line_indent -= app->pref_editor_tab_width; + line_indent = MAX(0, line_indent); + sci_set_line_indentation(sci, line, line_indent); + } +} + + +/* Reads the word at given cursor position and writes it into the given buffer. The buffer will be + * NULL terminated in any case, even when the word is truncated because wordlen is too small. + * position can be -1, then the current position is used. + * wc are the wordchars to use, if NULL, GEANY_WORDCHARS will be used */ +void editor_find_current_word(ScintillaObject *sci, gint pos, gchar *word, size_t wordlen, + const gchar *wc) +{ + gint line, line_start, startword, endword; + gchar *chunk; + + if (pos == -1) + pos = sci_get_current_position(sci); + + line = sci_get_line_from_position(sci, pos); + line_start = sci_get_position_from_line(sci, line); + startword = pos - line_start; + endword = pos - line_start; + + word[0] = '\0'; + chunk = sci_get_line(sci, line); + + if (wc == NULL) + wc = GEANY_WORDCHARS; + + while (startword > 0 && strchr(wc, chunk[startword - 1])) + startword--; + while (chunk[endword] && strchr(wc, chunk[endword])) + endword++; + if(startword == endword) + return; + + chunk[endword] = '\0'; + + g_strlcpy(word, chunk + startword, wordlen); //ensure null terminated + g_free(chunk); +} + + +static gint find_previous_brace(ScintillaObject *sci, gint pos) +{ + gchar c; + gint orig_pos = pos; + + c = SSM(sci, SCI_GETCHARAT, pos, 0); + while (pos >= 0 && pos > orig_pos - 300) + { + c = SSM(sci, SCI_GETCHARAT, pos, 0); + pos--; + if (utils_is_opening_brace(c)) return pos; + } + return -1; +} + + +static gint find_start_bracket(ScintillaObject *sci, gint pos) +{ + gchar c; + gint brackets = 0; + gint orig_pos = pos; + + c = SSM(sci, SCI_GETCHARAT, pos, 0); + while (pos > 0 && pos > orig_pos - 300) + { + c = SSM(sci, SCI_GETCHARAT, pos, 0); + if (c == ')') brackets++; + else if (c == '(') brackets--; + pos--; + if (brackets < 0) return pos; // found start bracket + } + return -1; +} + + +static gboolean append_calltip(GString *str, const TMTag *tag, filetype_id ft_id) +{ + if (! tag->atts.entry.arglist) return FALSE; + + if (tag->atts.entry.var_type) + { + guint i; + + g_string_append(str, tag->atts.entry.var_type); + for (i = 0; i < tag->atts.entry.pointerOrder; i++) + { + g_string_append_c(str, '*'); + } + g_string_append_c(str, ' '); + } + if (tag->atts.entry.scope) + { + const gchar *cosep = symbols_get_context_separator(ft_id); + + g_string_append(str, tag->atts.entry.scope); + g_string_append(str, cosep); + } + g_string_append(str, tag->name); + g_string_append_c(str, ' '); + g_string_append(str, tag->atts.entry.arglist); + + return TRUE; +} + + +static gchar *find_calltip(const gchar *word, filetype *ft) +{ + const GPtrArray *tags; + const gint arg_types = tm_tag_function_t | tm_tag_prototype_t | + tm_tag_method_t | tm_tag_macro_with_arg_t; + TMTagAttrType *attrs = NULL; + TMTag *tag; + GString *str = NULL; + guint i; + + g_return_val_if_fail(ft && word && *word, NULL); + + tags = tm_workspace_find(word, arg_types | tm_tag_class_t, attrs, FALSE, ft->lang); + if (tags->len == 0) + return NULL; + + tag = TM_TAG(tags->pdata[0]); + + if (tag->type == tm_tag_class_t && FILETYPE_ID(ft) == GEANY_FILETYPES_D) + { + // user typed e.g. 'new Classname(' so lookup D constructor Classname::this() + tags = tm_workspace_find_scoped("this", tag->name, + arg_types, attrs, FALSE, ft->lang, TRUE); + if (tags->len == 0) + return NULL; + } + + // remove tags with no argument list + for (i = 0; i < tags->len; i++) + { + tag = TM_TAG(tags->pdata[i]); + + if (! tag->atts.entry.arglist) + tags->pdata[i] = NULL; + } + tm_tags_prune((GPtrArray *) tags); + if (tags->len == 0) + return NULL; + else + { // remove duplicate calltips + TMTagAttrType sort_attr[] = {tm_tag_attr_name_t, tm_tag_attr_scope_t, + tm_tag_attr_arglist_t, 0}; + + tm_tags_sort((GPtrArray *) tags, sort_attr, TRUE); + } + + // if the current word has changed since last time, start with the first tag match + if (! utils_str_equal(word, calltip.last_word)) + calltip.tag_index = 0; + // cache the current word for next time + g_free(calltip.last_word); + calltip.last_word = g_strdup(word); + calltip.tag_index = MIN(calltip.tag_index, tags->len - 1); // ensure tag_index is in range + + for (i = calltip.tag_index; i < tags->len; i++) + { + tag = TM_TAG(tags->pdata[i]); + + if (str == NULL) + { + str = g_string_new(NULL); + if (calltip.tag_index > 0) + g_string_prepend(str, "\001 "); // up arrow + append_calltip(str, tag, FILETYPE_ID(ft)); + } + else // add a down arrow + { + if (calltip.tag_index > 0) // already have an up arrow + g_string_insert_c(str, 1, '\002'); + else + g_string_prepend(str, "\002 "); + break; + } + } + if (str) + { + gchar *result = str->str; + + g_string_free(str, FALSE); + return result; + } + return NULL; +} + + +// use pos = -1 to search for the previous unmatched open bracket. +gboolean editor_show_calltip(gint idx, gint pos) +{ + gint orig_pos = pos; // the position for the calltip + gint lexer; + gint style; + gchar word[GEANY_MAX_WORD_LENGTH]; + gchar *str; + ScintillaObject *sci; + + if (idx == -1 || ! doc_list[idx].is_valid || doc_list[idx].file_type == NULL) return FALSE; + sci = doc_list[idx].sci; + + lexer = SSM(sci, SCI_GETLEXER, 0, 0); + + if (pos == -1) + { + // position of '(' is unknown, so go backwards from current position to find it + pos = SSM(sci, SCI_GETCURRENTPOS, 0, 0); + pos--; + orig_pos = pos; + pos = (lexer == SCLEX_LATEX) ? find_previous_brace(sci, pos) : + find_start_bracket(sci, pos); + if (pos == -1) return FALSE; + } + + style = SSM(sci, SCI_GETSTYLEAT, pos, 0); + if (is_comment(lexer, style)) + return FALSE; + // never show a calltip in a PHP file outside of the <? ?> tags + if (lexer == SCLEX_HTML && ! (style >= SCE_HPHP_DEFAULT && style <= SCE_HPHP_OPERATOR)) + return FALSE; + + word[0] = '\0'; + editor_find_current_word(sci, pos - 1, word, sizeof word, NULL); + if (word[0] == '\0') return FALSE; + + str = find_calltip(word, doc_list[idx].file_type); + if (str) + { + g_free(calltip.text); // free the old calltip + calltip.text = str; + calltip.set = TRUE; + utils_wrap_string(calltip.text, -1); + SSM(sci, SCI_CALLTIPSHOW, orig_pos, (sptr_t) calltip.text); + return TRUE; + } + return FALSE; +} + + +static void show_autocomplete(ScintillaObject *sci, gint rootlen, const gchar *words) +{ + // store whether a calltip is showing, so we can reshow it after autocompletion + calltip.set = SSM(sci, SCI_CALLTIPACTIVE, 0, 0); + SSM(sci, SCI_AUTOCSHOW, rootlen, (sptr_t) words); +} + + +static gboolean +autocomplete_html(ScintillaObject *sci, const gchar *root, gsize rootlen) +{ // HTML entities auto completion + guint i, j = 0; + GString *words; + const gchar **entities = symbols_get_html_entities(); + + if (*root != '&' || entities == NULL) return FALSE; + + words = g_string_sized_new(500); + for (i = 0; ; i++) + { + if (entities[i] == NULL) break; + else if (entities[i][0] == '#') continue; + + if (! strncmp(entities[i], root, rootlen)) + { + if (j++ > 0) g_string_append_c(words, ' '); + g_string_append(words, entities[i]); + } + } + if (words->len > 0) show_autocomplete(sci, rootlen, words->str); + g_string_free(words, TRUE); + return TRUE; +} + + +static gboolean +autocomplete_tags(gint idx, gchar *root, gsize rootlen) +{ // PHP, LaTeX, C, C++, D and Java tag autocompletion + TMTagAttrType attrs[] = { tm_tag_attr_name_t, 0 }; + const GPtrArray *tags; + ScintillaObject *sci; + + if (! DOC_IDX_VALID(idx) || doc_list[idx].file_type == NULL) + return FALSE; + sci = doc_list[idx].sci; + + tags = tm_workspace_find(root, tm_tag_max_t, attrs, TRUE, doc_list[idx].file_type->lang); + if (NULL != tags && tags->len > 0) + { + GString *words = g_string_sized_new(150); + guint j; + + for (j = 0; ((j < tags->len) && (j < GEANY_MAX_AUTOCOMPLETE_WORDS)); ++j) + { + if (j > 0) g_string_append_c(words, ' '); + g_string_append(words, ((TMTag *) tags->pdata[j])->name); + } + show_autocomplete(sci, rootlen, words->str); + g_string_free(words, TRUE); + } + return TRUE; +} + + +gboolean editor_start_auto_complete(gint idx, gint pos, gboolean force) +{ + gint line, line_start, line_len, line_pos, current, rootlen, startword, lexer, style; + gchar *linebuf, *root; + ScintillaObject *sci; + gboolean ret = FALSE; + gchar *wordchars; + filetype *ft; + + if ((! app->pref_editor_auto_complete_symbols && ! force) || + ! DOC_IDX_VALID(idx) || doc_list[idx].file_type == NULL) + return FALSE; + + sci = doc_list[idx].sci; + ft = doc_list[idx].file_type; + + line = sci_get_line_from_position(sci, pos); + line_start = sci_get_position_from_line(sci, line); + line_len = sci_get_line_length(sci, line); + line_pos = pos - line_start - 1; + current = pos - line_start; + startword = current; + lexer = SSM(sci, SCI_GETLEXER, 0, 0); + style = SSM(sci, SCI_GETSTYLEAT, pos, 0); + + // don't autocomplete in comments and strings + if (is_comment(lexer, style)) + return FALSE; + + linebuf = sci_get_line(sci, line); + + if (ft->id == GEANY_FILETYPES_LATEX) + wordchars = GEANY_WORDCHARS"\\"; // add \ to word chars if we are in a LaTeX file + else if (ft->id == GEANY_FILETYPES_HTML || ft->id == GEANY_FILETYPES_PHP) + wordchars = GEANY_WORDCHARS"&"; // add & to word chars if we are in a PHP or HTML file + else + wordchars = GEANY_WORDCHARS; + + // find the start of the current word + while ((startword > 0) && (strchr(wordchars, linebuf[startword - 1]))) + startword--; + linebuf[current] = '\0'; + root = linebuf + startword; + rootlen = current - startword; + + // entity autocompletion always in a HTML file, in a PHP file only when we are outside of <? ?> + if (ft->id == GEANY_FILETYPES_HTML || + (ft->id == GEANY_FILETYPES_PHP && (style < SCE_HPHP_DEFAULT || style > SCE_HPHP_OPERATOR))) + ret = autocomplete_html(sci, root, rootlen); + else + { + // force is set when called by keyboard shortcut, otherwise start at the 4th char + if (force || rootlen >= 4) + ret = autocomplete_tags(idx, root, rootlen); + } + + g_free(linebuf); + return ret; +} + + +void editor_auto_latex(gint idx, gint pos) +{ + ScintillaObject *sci; + + if (idx == -1 || ! doc_list[idx].is_valid || doc_list[idx].file_type == NULL) return; + sci = doc_list[idx].sci; + + if (sci_get_char_at(sci, pos - 2) == '}') + { + gchar *eol, *buf, *construct; + gchar env[50]; + gint line = sci_get_line_from_position(sci, pos - 2); + gint line_len = sci_get_line_length(sci, line); + gint i, start; + + // get the line + buf = sci_get_line(sci, line); + + // get to the first non-blank char (some kind of ltrim()) + start = 0; + //while (isspace(buf[i++])) start++; + while (isspace(buf[start])) start++; + + // check for begin + if (strncmp(buf + start, "\\begin", 6) == 0) + { + gchar full_cmd[15]; + guint j = 0; + + // take also "\begingroup" (or whatever there can be) and append "\endgroup" and so on. + i = start + 6; + 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++; + j++; + } + full_cmd[j] = '\0'; + + // go through the line and get the environment + for (i = start + j; i < line_len; i++) + { + if (buf[i] == '{') + { + j = 0; + i++; + while (buf[i] != '}' && j < (sizeof(env) - 1)) + { // this could be done in a shorter way, but so it remains readable ;-) + env[j] = buf[i]; + j++; + i++; + } + env[j] = '\0'; + break; + } + } + + // get the indention + if (doc_list[idx].use_auto_indention) get_indent(sci, pos, TRUE); + eol = g_strconcat(utils_get_eol_char(idx), indent, NULL); + + construct = g_strdup_printf("%s\\end%s{%s}", eol, full_cmd, env); + + SSM(sci, SCI_INSERTTEXT, pos, (sptr_t) construct); + sci_goto_pos(sci, pos + 1, TRUE); + g_free(construct); + g_free(eol); + } + // later there could be some else ifs for other keywords + + g_free(buf); + } +} + + +/* This should use a string with the current word instead of buf, but we will replace this + * code with user-defined construct completion. */ +static gboolean complete_constructs(gint idx, gint pos, const gchar *buf, const gchar *space, + const gchar *eol) +{ + gboolean result; + gchar *construct = NULL; + gint space_len = strlen(space); + ScintillaObject *sci = doc_list[idx].sci; + + // "pattern", buf + x, y -> x + y = 15, because buf is (pos - 15)...(pos) = 15 + if (! strncmp("if", buf + 13, 2)) + { + if (! isspace(*(buf + 12))) + return FALSE; + + construct = g_strdup_printf("()%s{%s%s%s}%s", eol, eol, space, eol, eol); + + SSM(sci, SCI_INSERTTEXT, pos, (sptr_t) construct); + sci_goto_pos(sci, pos + 1, TRUE); + } + else if (! strncmp("else", buf + 11, 4)) + { + if (! isspace(*(buf + 10))) + return FALSE; + + construct = g_strdup_printf("%s{%s%s%s}%s", eol, eol, space, eol, eol); + + SSM(sci, SCI_INSERTTEXT, pos, (sptr_t) construct); + sci_goto_pos(sci, pos + 3 + space_len + (2 * strlen(indent)), TRUE); + } + else if (! strncmp("for", buf + 12, 3)) + { + gchar *var; + gint contruct_len; + + if (! isspace(*(buf + 11))) + return FALSE; + + if (doc_list[idx].file_type->id == GEANY_FILETYPES_PHP) + { + var = g_strdup("$i"); + contruct_len = 14; + } + else + { + var = g_strdup("i"); + contruct_len = 12; + } + construct = g_strdup_printf("(%s%s = 0; %s < ; %s++)%s{%s%s%s}%s", + (doc_list[idx].file_type->id == GEANY_FILETYPES_CPP) ? "int " : "", + var, var, var, eol, eol, space, eol, eol); + + // add 4 characters because of "int " in C++ mode + contruct_len += (doc_list[idx].file_type->id == GEANY_FILETYPES_CPP) ? 4 : 0; + + SSM(sci, SCI_INSERTTEXT, pos, (sptr_t) construct); + sci_goto_pos(sci, pos + contruct_len, TRUE); + g_free(var); + } + else if (! strncmp("while", buf + 10, 5)) + { + if (! isspace(*(buf + 9))) + return FALSE; + + construct = g_strdup_printf("()%s{%s%s%s}%s", eol, eol, space, eol, eol); + + SSM(sci, SCI_INSERTTEXT, pos, (sptr_t) construct); + sci_goto_pos(sci, pos + 1, TRUE); + } + else if (! strncmp("do", buf + 13, 2)) + { + if (! isspace(*(buf + 12))) + return FALSE; + + construct = g_strdup_printf("%s{%s%s%s}%swhile ();%s", eol, eol, space, eol, eol, eol); + + SSM(sci, SCI_INSERTTEXT, pos, (sptr_t) construct); + sci_goto_pos(sci, pos + 3 + space_len + (2 * strlen(indent)), TRUE); + } + else if (! strncmp("try", buf + 12, 3)) + { + if (! isspace(*(buf + 11))) + return FALSE; + + construct = g_strdup_printf("%s{%s%s%s}%scatch ()%s{%s%s%s}%s", + eol, eol, space, eol, eol, eol, eol, space, eol, eol); + + SSM(sci, SCI_INSERTTEXT, pos, (sptr_t) construct); + sci_goto_pos(sci, pos + 3 + space_len + (2 * strlen(indent)), TRUE); + } + else if (! strncmp("switch", buf + 9, 6)) + { + if (! isspace(*(buf + 8))) + return FALSE; + + construct = g_strdup_printf("()%s{%s%scase : break;%s%sdefault: %s}%s", + eol, eol, space, eol, space, eol, eol); + + SSM(sci, SCI_INSERTTEXT, pos, (sptr_t) construct); + sci_goto_pos(sci, pos + 1, TRUE); + } + else if (doc_list[idx].file_type->id == GEANY_FILETYPES_FERITE && ! strncmp("iferr", buf + 10, 5)) + { + if (! isspace(*(buf + 9))) + return FALSE; + + construct = g_strdup_printf("%s{%s%s%s}%sfix%s{%s%s%s}%s", + eol, eol, space, eol, eol, eol, eol, space, eol, eol); + + SSM(sci, SCI_INSERTTEXT, pos, (sptr_t) construct); + sci_goto_pos(sci, pos + 3 + space_len + (2 * strlen(indent)), TRUE); + } + else if (doc_list[idx].file_type->id == GEANY_FILETYPES_FERITE && ! strncmp("monitor", buf + 8, 7)) + { + if (! isspace(*(buf + 7))) + return FALSE; + + construct = g_strdup_printf("%s{%s%s%s}%shandle%s{%s%s%s}%s", + eol, eol, space, eol, eol, eol, eol, space, eol, eol); + + SSM(sci, SCI_INSERTTEXT, pos, (sptr_t) construct); + sci_goto_pos(sci, pos + 3 + space_len + (2 * strlen(indent)), TRUE); + } + result = (construct != NULL); + if (result) + { + sci_insert_text(sci, pos, " "); // prefix all constructs with a space + } + g_free(construct); + return result; +} + + +static gboolean at_eol(ScintillaObject *sci, gint pos) +{ + gint line = sci_get_line_from_position(sci, pos); + + return (pos == sci_get_line_end_position(sci, line)); +} + + +gboolean editor_auto_forif(gint idx, gint pos) +{ + gboolean result; + gchar buf[16]; + gchar *eol; + gchar *space; + gint lexer, style; + gint i; + ScintillaObject *sci; + + if (idx == -1 || ! doc_list[idx].is_valid || doc_list[idx].file_type == NULL) return FALSE; + + // only for C, C++, D, Ferite, Java, JavaScript, Perl and PHP + if (doc_list[idx].file_type->id != GEANY_FILETYPES_PHP && + doc_list[idx].file_type->id != GEANY_FILETYPES_C && + doc_list[idx].file_type->id != GEANY_FILETYPES_D && + doc_list[idx].file_type->id != GEANY_FILETYPES_CPP && + doc_list[idx].file_type->id != GEANY_FILETYPES_PERL && + doc_list[idx].file_type->id != GEANY_FILETYPES_JAVA && + doc_list[idx].file_type->id != GEANY_FILETYPES_JS && + doc_list[idx].file_type->id != GEANY_FILETYPES_FERITE) + return FALSE; + + sci = doc_list[idx].sci; + // return if we are editing an existing line (chars on right of cursor) + if (! at_eol(sci, pos)) + return FALSE; + + lexer = SSM(sci, SCI_GETLEXER, 0, 0); + style = SSM(sci, SCI_GETSTYLEAT, pos - 2, 0); + // return, if we are in a comment + if (is_comment(lexer, style)) + return FALSE; + // never auto complete in a PHP file outside of the <? ?> tags + if (lexer == SCLEX_HTML && ! (style >= SCE_HPHP_DEFAULT && style <= SCE_HPHP_OPERATOR)) + return FALSE; + + sci_get_text_range(sci, pos - 15, pos, buf); + if (sizeof(buf) != strlen(buf) + 1) + return FALSE; // not enough chars in document + + /* check that the chars before the current word are only whitespace (on this line). + * this prevents completion of '} while ' */ + i = 14; // index before \0 char + while (i >= 0 && isalpha(buf[i])) i--; // find pos before keyword + while (i >= 0 && buf[i] != '\n' && buf[i] != '\r') // we want to stay in this line('\n' check) + { + if (! isspace(buf[i])) + { + return FALSE; + } + i--; + } + + // get the indentation + if (doc_list[idx].use_auto_indention) get_indent(sci, pos, TRUE); + eol = g_strconcat(utils_get_eol_char(idx), indent, NULL); + + // get the whitespace for additional indentation + space = utils_get_whitespace(app->pref_editor_tab_width, FALSE); + + sci_start_undo_action(sci); // needed while we insert a space separately from construct + result = complete_constructs(idx, pos, buf, space, eol); + sci_end_undo_action(sci); + + utils_free_pointers(eol, space, NULL); + return result; +} + + +void editor_show_macro_list(ScintillaObject *sci) +{ + GString *words; + + if (sci == NULL) return; + + words = symbols_get_macro_list(); + if (words == NULL) return; + + SSM(sci, SCI_USERLISTSHOW, 1, (sptr_t) words->str); + g_string_free(words, TRUE); +} + + +/** + * (stolen from anjuta and heavily modified) + * This routine will auto complete XML or HTML tags that are still open by closing them + * @param ch The character we are dealing with, currently only works with the '>' character + * @return True if handled, false otherwise + */ +static gboolean handle_xml(ScintillaObject *sci, gchar ch, gint idx) +{ + gint lexer = SSM(sci, SCI_GETLEXER, 0, 0); + gint pos, min; + gchar *str_found, sel[512]; + + // If the user has turned us off, quit now. + // This may make sense only in certain languages + if (! app->pref_editor_auto_close_xml_tags || (lexer != SCLEX_HTML && lexer != SCLEX_XML)) + return FALSE; + + pos = sci_get_current_position(sci); + + // return if we are in PHP but not in a string or outside of <? ?> tags + if (doc_list[idx].file_type->id == GEANY_FILETYPES_PHP) + { + gint style = sci_get_style_at(sci, pos); + if (style != SCE_HPHP_SIMPLESTRING && style != SCE_HPHP_HSTRING && + style <= SCE_HPHP_OPERATOR && style >= SCE_HPHP_DEFAULT) + return FALSE; + } + + // if ch is /, check for </, else quit + if (ch == '/' && sci_get_char_at(sci, pos - 2) != '<') + return FALSE; + + // Grab the last 512 characters or so + min = pos - (sizeof(sel) - 1); + if (min < 0) min = 0; + + if (pos - min < 3) + return FALSE; // Smallest tag is 3 characters e.g. <p> + + sci_get_text_range(sci, min, pos, sel); + sel[sizeof(sel) - 1] = '\0'; + + if (ch == '>' && sel[pos - min - 2] == '/') + // User typed something like "<br/>" + return FALSE; + + if (ch == '/') + str_found = utils_find_open_xml_tag(sel, pos - min, TRUE); + else + str_found = utils_find_open_xml_tag(sel, pos - min, FALSE); + + // when found string is something like br, img or another short tag, quit + if (utils_str_equal(str_found, "br") + || utils_str_equal(str_found, "img") + || utils_str_equal(str_found, "base") + || utils_str_equal(str_found, "basefont") // < or not < + || utils_str_equal(str_found, "frame") + || utils_str_equal(str_found, "input") + || utils_str_equal(str_found, "link") + || utils_str_equal(str_found, "area") + || utils_str_equal(str_found, "meta")) + { + return FALSE; + } + + if (strlen(str_found) > 0) + { + gchar *to_insert; + if (ch == '/') + to_insert = g_strconcat(str_found, ">", NULL); + else + to_insert = g_strconcat("</", str_found, ">", NULL); + sci_start_undo_action(sci); + sci_replace_sel(sci, to_insert); + if (ch == '>') + { + SSM(sci, SCI_SETSEL, pos, pos); + if (utils_str_equal(str_found, "table")) editor_auto_table(sci, pos); + } + sci_end_undo_action(sci); + g_free(to_insert); + g_free(str_found); + return TRUE; + } + + + g_free(str_found); + return FALSE; +} + + +void editor_auto_table(ScintillaObject *sci, gint pos) +{ + gchar *table; + gint indent_pos; + + if (SSM(sci, SCI_GETLEXER, 0, 0) != SCLEX_HTML) return; + + get_indent(sci, pos, TRUE); + indent_pos = sci_get_line_indent_position(sci, sci_get_line_from_position(sci, pos)); + if ((pos - 7) != indent_pos) // 7 == strlen("<table>") + { + gint i, x; + x = strlen(indent); + // find the start of the <table tag + i = 1; + while (i <= pos && sci_get_char_at(sci, pos - i) != '<') i++; + // add all non whitespace before the tag to the indent string + while ((pos - i) != indent_pos) + { + indent[x++] = ' '; + i++; + } + indent[x] = '\0'; + } + + table = g_strconcat("\n", indent, " <tr>\n", indent, " <td>\n", indent, " </td>\n", + indent, " </tr>\n", indent, NULL); + sci_insert_text(sci, pos, table); + g_free(table); +} + + +static void real_comment_multiline(gint idx, gint line_start, gint last_line) +{ + gchar *eol, *str_begin, *str_end; + gint line_len; + + if (idx == -1 || ! doc_list[idx].is_valid || doc_list[idx].file_type == NULL) return; + + eol = utils_get_eol_char(idx); + str_begin = g_strdup_printf("%s%s", doc_list[idx].file_type->comment_open, eol); + str_end = g_strdup_printf("%s%s", doc_list[idx].file_type->comment_close, eol); + + // insert the comment strings + sci_insert_text(doc_list[idx].sci, line_start, str_begin); + line_len = sci_get_position_from_line(doc_list[idx].sci, last_line + 2); + sci_insert_text(doc_list[idx].sci, line_len, str_end); + + g_free(str_begin); + g_free(str_end); +} + + +static void real_uncomment_multiline(gint idx) +{ + // find the beginning of the multi line comment + gint pos, line, len, x; + gchar *linebuf; + + if (idx == -1 || ! doc_list[idx].is_valid || doc_list[idx].file_type == NULL) return; + + // remove comment open chars + pos = document_find_text(idx, doc_list[idx].file_type->comment_open, 0, TRUE, FALSE); + SSM(doc_list[idx].sci, SCI_DELETEBACK, 0, 0); + + // 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 = 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); + g_free(linebuf); + + // remove comment close chars + pos = document_find_text(idx, doc_list[idx].file_type->comment_close, 0, FALSE, FALSE); + SSM(doc_list[idx].sci, SCI_DELETEBACK, 0, 0); + + // 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 = 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); + g_free(linebuf); +} + + +void editor_do_uncomment(gint idx, gint line) +{ + gint first_line, last_line; + gint x, i, line_start, line_len; + gint sel_start, sel_end; + gsize co_len; + gchar sel[256], *co, *cc; + gboolean break_loop = FALSE, single_line = FALSE; + filetype *ft; + + if (idx == -1 || ! doc_list[idx].is_valid || doc_list[idx].file_type == NULL) return; + + if (line < 0) + { // use selection or current line + sel_start = sci_get_selection_start(doc_list[idx].sci); + sel_end = sci_get_selection_end(doc_list[idx].sci); + + first_line = sci_get_line_from_position(doc_list[idx].sci, sel_start); + // Find the last line with chars selected (not EOL char) + last_line = sci_get_line_from_position(doc_list[idx].sci, sel_end - 1); + last_line = MAX(first_line, last_line); + } + else + { + first_line = last_line = line; + sel_start = sel_end = sci_get_position_from_line(doc_list[idx].sci, line); + } + + ft = doc_list[idx].file_type; + + // detection of HTML vs PHP code, if non-PHP set filetype to XML + line_start = sci_get_position_from_line(doc_list[idx].sci, first_line); + if (ft->id == GEANY_FILETYPES_PHP) + { + if (sci_get_style_at(doc_list[idx].sci, line_start) < 118 || + sci_get_style_at(doc_list[idx].sci, line_start) > 127) + ft = filetypes[GEANY_FILETYPES_XML]; + } + + co = ft->comment_open; + cc = ft->comment_close; + if (co == NULL) return; + + co_len = strlen(co); + if (co_len == 0) return; + + SSM(doc_list[idx].sci, SCI_BEGINUNDOACTION, 0, 0); + + for (i = first_line; (i <= last_line) && (! break_loop); i++) + { + gint buf_len; + + line_start = sci_get_position_from_line(doc_list[idx].sci, i); + line_len = sci_get_line_length(doc_list[idx].sci, i); + x = 0; + + buf_len = MIN((gint)sizeof(sel) - 1, line_len - 1); + if (buf_len <= 0) + continue; + sci_get_text_range(doc_list[idx].sci, line_start, line_start + buf_len, sel); + sel[buf_len] = '\0'; + + while (isspace(sel[x])) x++; + + // to skip blank lines + if (x < line_len && sel[x] != '\0') + { + // use single line comment + if (cc == NULL || strlen(cc) == 0) + { + guint j; + + single_line = TRUE; + + switch (co_len) + { + case 1: if (sel[x] != co[0]) continue; break; + case 2: if (sel[x] != co[0] || sel[x+1] != co[1]) continue; break; + case 3: if (sel[x] != co[0] || sel[x+1] != co[1] || sel[x+2] != co[2]) + continue; break; + default: continue; + } + + SSM(doc_list[idx].sci, SCI_GOTOPOS, line_start + x + co_len, 0); + for (j = 0; j < co_len; j++) SSM(doc_list[idx].sci, SCI_DELETEBACK, 0, 0); + } + // use multi line comment + else + { + gint style_comment; + gint lexer = SSM(doc_list[idx].sci, SCI_GETLEXER, 0, 0); + + // process only lines which are already comments + switch (lexer) + { // I will list only those lexers which support multi line comments + case SCLEX_XML: + case SCLEX_HTML: + { + if (sci_get_style_at(doc_list[idx].sci, line_start) >= 118 && + sci_get_style_at(doc_list[idx].sci, line_start) <= 127) + style_comment = SCE_HPHP_COMMENT; + else style_comment = SCE_H_COMMENT; + break; + } + case SCLEX_CSS: style_comment = SCE_CSS_COMMENT; break; + case SCLEX_SQL: style_comment = SCE_SQL_COMMENT; break; + case SCLEX_CAML: style_comment = SCE_CAML_COMMENT; break; + case SCLEX_D: style_comment = SCE_D_COMMENT; break; + default: style_comment = SCE_C_COMMENT; + } + if (sci_get_style_at(doc_list[idx].sci, line_start + x) == style_comment) + { + real_uncomment_multiline(idx); + } + + // break because we are already on the last line + break_loop = TRUE; + break; + } + } + } + SSM(doc_list[idx].sci, SCI_ENDUNDOACTION, 0, 0); + + // restore selection if there is one + if (sel_start < sel_end) + { + if (single_line) + { + sci_set_selection_start(doc_list[idx].sci, sel_start - co_len); + sci_set_selection_end(doc_list[idx].sci, sel_end - ((i - first_line) * co_len)); + } + else + { + gint eol_len = (sci_get_eol_mode(doc_list[idx].sci) == SC_EOL_CRLF) ? 2 : 1; + sci_set_selection_start(doc_list[idx].sci, sel_start - co_len - eol_len); + sci_set_selection_end(doc_list[idx].sci, sel_end - co_len - eol_len); + } + } +} + + +void editor_do_comment_toggle(gint idx) +{ + gint first_line, last_line; + gint x, i, line_start, line_len; + gint sel_start, sel_end, co_len; + gint count_commented = 0, count_uncommented = 0; + gchar sel[256], *co, *cc; + gboolean break_loop = FALSE, single_line = FALSE; + gboolean first_line_was_comment = FALSE; + filetype *ft; + + if (idx == -1 || ! doc_list[idx].is_valid || doc_list[idx].file_type == NULL) return; + + sel_start = sci_get_selection_start(doc_list[idx].sci); + sel_end = sci_get_selection_end(doc_list[idx].sci); + + ft = doc_list[idx].file_type; + + first_line = sci_get_line_from_position(doc_list[idx].sci, + sci_get_selection_start(doc_list[idx].sci)); + // Find the last line with chars selected (not EOL char) + last_line = sci_get_line_from_position(doc_list[idx].sci, + sci_get_selection_end(doc_list[idx].sci) - 1); + last_line = MAX(first_line, last_line); + + // detection of HTML vs PHP code, if non-PHP set filetype to XML + line_start = sci_get_position_from_line(doc_list[idx].sci, first_line); + if (ft->id == GEANY_FILETYPES_PHP) + { + if (sci_get_style_at(doc_list[idx].sci, line_start) < 118 || + sci_get_style_at(doc_list[idx].sci, line_start) > 127) + ft = filetypes[GEANY_FILETYPES_XML]; + } + + co = ft->comment_open; + cc = ft->comment_close; + if (co == NULL) return; + + co_len = strlen(co); + if (co_len == 0) return; + + SSM(doc_list[idx].sci, SCI_BEGINUNDOACTION, 0, 0); + + for (i = first_line; (i <= last_line) && (! break_loop); i++) + { + gint buf_len; + + line_start = sci_get_position_from_line(doc_list[idx].sci, i); + line_len = sci_get_line_length(doc_list[idx].sci, i); + x = 0; + + buf_len = MIN((gint)sizeof(sel) - 1, line_len - 1); + if (buf_len <= 0) + continue; + sci_get_text_range(doc_list[idx].sci, line_start, line_start + buf_len, sel); + sel[buf_len] = '\0'; + + while (isspace(sel[x])) x++; + + // to skip blank lines + if (x < line_len && sel[x] != '\0') + { + // use single line comment + if (cc == NULL || strlen(cc) == 0) + { + gboolean do_continue = FALSE; + single_line = TRUE; + + switch (co_len) + { + case 1: + if (sel[x] == co[0]) + { + do_continue = TRUE; + editor_do_uncomment(idx, i); + count_uncommented++; + } + break; + case 2: + if (sel[x] == co[0] && sel[x+1] == co[1]) + { + do_continue = TRUE; + editor_do_uncomment(idx, i); + count_uncommented++; + } + break; + case 3: + if (sel[x] == co[0] && sel[x+1] == co[1] && sel[x+2] == co[2]) + { + do_continue = TRUE; + editor_do_uncomment(idx, i); + count_uncommented++; + } + break; + default: return; + } + if (do_continue && i == first_line) first_line_was_comment = TRUE; + if (do_continue) continue; + + // we are still here, so the above lines were not already comments, so comment it + editor_do_comment(idx, i, FALSE); + count_commented++; + } + // use multi line comment + else + { + gint style_comment; + gint lexer = SSM(doc_list[idx].sci, SCI_GETLEXER, 0, 0); + + // skip lines which are already comments + switch (lexer) + { // I will list only those lexers which support multi line comments + case SCLEX_XML: + case SCLEX_HTML: + { + if (sci_get_style_at(doc_list[idx].sci, line_start) >= 118 && + sci_get_style_at(doc_list[idx].sci, line_start) <= 127) + style_comment = SCE_HPHP_COMMENT; + else style_comment = SCE_H_COMMENT; + break; + } + case SCLEX_CSS: style_comment = SCE_CSS_COMMENT; break; + case SCLEX_SQL: style_comment = SCE_SQL_COMMENT; break; + case SCLEX_CAML: style_comment = SCE_CAML_COMMENT; break; + case SCLEX_D: style_comment = SCE_D_COMMENT; break; + default: style_comment = SCE_C_COMMENT; + } + if (sci_get_style_at(doc_list[idx].sci, line_start + x) == style_comment) + { + real_uncomment_multiline(idx); + count_uncommented++; + } + else + { + real_comment_multiline(idx, line_start, last_line); + count_commented++; + } + + // break because we are already on the last line + break_loop = TRUE; + break; + } + } + } + + SSM(doc_list[idx].sci, SCI_ENDUNDOACTION, 0, 0); + + // restore selection if there is one + if (sel_start < sel_end) + { + if (single_line) + { + gint a = (first_line_was_comment) ? - co_len : co_len; + + // don't modify sel_start when the selection starts within indentation + get_indent(doc_list[idx].sci, sel_start, TRUE); + if ((sel_start - line_start) <= (gint) strlen(indent)) + a = 0; + + sci_set_selection_start(doc_list[idx].sci, sel_start + a); + sci_set_selection_end(doc_list[idx].sci, sel_end + + (count_commented * co_len) - (count_uncommented * co_len)); + } + else + { + gint eol_len = (sci_get_eol_mode(doc_list[idx].sci) == SC_EOL_CRLF) ? 2 : 1; + if (count_uncommented > 0) + { + sci_set_selection_start(doc_list[idx].sci, sel_start - co_len - eol_len); + sci_set_selection_end(doc_list[idx].sci, sel_end - co_len - eol_len); + } + else + { + sci_set_selection_start(doc_list[idx].sci, sel_start + co_len + eol_len); + sci_set_selection_end(doc_list[idx].sci, sel_end + co_len + eol_len); + } + } + } + else if (count_uncommented > 0) + { + gint eol_len = (sci_get_eol_mode(doc_list[idx].sci) == SC_EOL_CRLF) ? 2 : 1; + sci_set_current_position(doc_list[idx].sci, sel_start - co_len - eol_len, TRUE); + } +} + + +void editor_do_comment(gint idx, gint line, gboolean allow_empty_lines) +{ + gint first_line, last_line; + gint x, i, line_start, line_len; + gint sel_start, sel_end, co_len; + gchar sel[256], *co, *cc; + gboolean break_loop = FALSE, single_line = FALSE; + filetype *ft; + + if (idx == -1 || ! doc_list[idx].is_valid || doc_list[idx].file_type == NULL) return; + + if (line < 0) + { // use selection or current line + sel_start = sci_get_selection_start(doc_list[idx].sci); + sel_end = sci_get_selection_end(doc_list[idx].sci); + + first_line = sci_get_line_from_position(doc_list[idx].sci, sel_start); + // Find the last line with chars selected (not EOL char) + last_line = sci_get_line_from_position(doc_list[idx].sci, sel_end - 1); + last_line = MAX(first_line, last_line); + } + else + { + first_line = last_line = line; + sel_start = sel_end = sci_get_position_from_line(doc_list[idx].sci, line); + } + + ft = doc_list[idx].file_type; + + // detection of HTML vs PHP code, if non-PHP set filetype to XML + line_start = sci_get_position_from_line(doc_list[idx].sci, first_line); + if (ft->id == GEANY_FILETYPES_PHP) + { + if (sci_get_style_at(doc_list[idx].sci, line_start) < 118 || + sci_get_style_at(doc_list[idx].sci, line_start) > 127) + ft = filetypes[GEANY_FILETYPES_XML]; + } + + co = ft->comment_open; + cc = ft->comment_close; + if (co == NULL) return; + + co_len = strlen(co); + if (co_len == 0) return; + + SSM(doc_list[idx].sci, SCI_BEGINUNDOACTION, 0, 0); + + for (i = first_line; (i <= last_line) && (! break_loop); i++) + { + gint buf_len; + + line_start = sci_get_position_from_line(doc_list[idx].sci, i); + line_len = sci_get_line_length(doc_list[idx].sci, i); + x = 0; + + buf_len = MIN((gint)sizeof(sel) - 1, line_len - 1); + if (buf_len <= 0) + continue; + sci_get_text_range(doc_list[idx].sci, line_start, line_start + buf_len, sel); + sel[buf_len] = '\0'; + + while (isspace(sel[x])) x++; + + // to skip blank lines + if (allow_empty_lines || (x < line_len && sel[x] != '\0')) + { + // use single line comment + if (cc == NULL || strlen(cc) == 0) + { + single_line = TRUE; + + if (ft->comment_use_indent) + sci_insert_text(doc_list[idx].sci, line_start + x, co); + else + sci_insert_text(doc_list[idx].sci, line_start, co); + } + // use multi line comment + else + { + gint style_comment; + gint lexer = SSM(doc_list[idx].sci, SCI_GETLEXER, 0, 0); + + // skip lines which are already comments + switch (lexer) + { // I will list only those lexers which support multi line comments + case SCLEX_XML: + case SCLEX_HTML: + { + if (sci_get_style_at(doc_list[idx].sci, line_start) >= 118 && + sci_get_style_at(doc_list[idx].sci, line_start) <= 127) + style_comment = SCE_HPHP_COMMENT; + else style_comment = SCE_H_COMMENT; + break; + } + case SCLEX_CSS: style_comment = SCE_CSS_COMMENT; break; + case SCLEX_SQL: style_comment = SCE_SQL_COMMENT; break; + case SCLEX_CAML: style_comment = SCE_CAML_COMMENT; break; + case SCLEX_D: style_comment = SCE_D_COMMENT; break; + default: style_comment = SCE_C_COMMENT; + } + if (sci_get_style_at(doc_list[idx].sci, line_start + x) == style_comment) continue; + + real_comment_multiline(idx, line_start, last_line); + + // break because we are already on the last line + break_loop = TRUE; + break; + } + } + } + SSM(doc_list[idx].sci, SCI_ENDUNDOACTION, 0, 0); + + // restore selection if there is one + if (sel_start < sel_end) + { + if (single_line) + { + sci_set_selection_start(doc_list[idx].sci, sel_start + co_len); + sci_set_selection_end(doc_list[idx].sci, sel_end + ((i - first_line) * co_len)); + } + else + { + gint eol_len = (sci_get_eol_mode(doc_list[idx].sci) == SC_EOL_CRLF) ? 2 : 1; + sci_set_selection_start(doc_list[idx].sci, sel_start + co_len + eol_len); + sci_set_selection_end(doc_list[idx].sci, sel_end + co_len + eol_len); + } + } +} + + +void editor_highlight_braces(ScintillaObject *sci, gint cur_pos) +{ + gint brace_pos = cur_pos - 1; + gint end_pos; + + if (! utils_isbrace(sci_get_char_at(sci, brace_pos))) + { + brace_pos++; + if (! utils_isbrace(sci_get_char_at(sci, brace_pos))) + { + SSM(sci, SCI_BRACEBADLIGHT, -1, 0); + return; + } + } + end_pos = SSM(sci, SCI_BRACEMATCH, brace_pos, 0); + + if (end_pos >= 0) + SSM(sci, SCI_BRACEHIGHLIGHT, brace_pos, end_pos); + else + SSM(sci, SCI_BRACEBADLIGHT, brace_pos, 0); +} + + +static gboolean is_doc_comment_char(gchar c, gint lexer) +{ + if (c == '*' && (lexer = SCLEX_HTML || lexer == SCLEX_CPP)) + return TRUE; + else if ((c == '*' || c == '+') && lexer == SCLEX_D) + return TRUE; + else + return FALSE; +} + + +static void auto_multiline(ScintillaObject *sci, gint pos) +{ + gint style = SSM(sci, SCI_GETSTYLEAT, pos - 2, 0); + gint lexer = SSM(sci, SCI_GETLEXER, 0, 0); + gint i; + + if ((lexer == SCLEX_CPP && (style == SCE_C_COMMENT || style == SCE_C_COMMENTDOC)) || + (lexer == SCLEX_HTML && style == SCE_HPHP_COMMENT) || + (lexer == SCLEX_D && (style == SCE_D_COMMENT || + style == SCE_D_COMMENTDOC || + style == SCE_D_COMMENTNESTED))) + { + gchar *previous_line = sci_get_line(sci, sci_get_line_from_position(sci, pos - 2)); + gchar *continuation = "*"; // the type of comment, '*' (C/C++/Java), '+' and the others (D) + gchar *whitespace = ""; // to hold whitespace if needed + gchar *result; + gint len = strlen(previous_line); + + // find and stop at end of multi line comment + i = len - 1; + while (i >= 0 && isspace(previous_line[i])) i--; + if (i >= 1 && is_doc_comment_char(previous_line[i - 1], lexer) && previous_line[i] == '/') + { + gint cur_line = sci_get_current_line(sci, -1); + gint indent_pos = sci_get_line_indent_position(sci, cur_line); + gint indent_len = sci_get_col_from_position(sci, indent_pos); + + /* if there is one too many spaces, delete the last space, + * to return to the indent used before the multiline comment was started. */ + if (indent_len % app->pref_editor_tab_width == 1) + SSM(sci, SCI_DELETEBACKNOTLINE, 0, 0); // remove whitespace indent + g_free(previous_line); + return; + } + // check whether we are on the second line of multi line comment + i = 0; + while (i < len && isspace(previous_line[i])) i++; // get to start of the line + + if (i + 1 < len && + previous_line[i] == '/' && is_doc_comment_char(previous_line[i + 1], lexer)) + { // we are on the second line of a multi line comment, so we have to insert white space + whitespace = " "; + } + + if (style == SCE_D_COMMENTNESTED) continuation = "+"; // for nested comments in D + + result = g_strconcat(whitespace, continuation, " ", NULL); + sci_add_text(sci, result); + g_free(result); + + g_free(previous_line); + } +} + + +/* Checks whether the given style is a comment or string for the given lexer. + * It doesn't handle LEX_HTML, this should be done by the caller. + * Returns true if the style is a comment, FALSE otherwise. + */ +static gboolean is_comment(gint lexer, gint style) +{ + gboolean result = FALSE; + + switch (lexer) + { + case SCLEX_CPP: + case SCLEX_PASCAL: + { + if (style == SCE_C_COMMENT || + style == SCE_C_COMMENTLINE || + style == SCE_C_COMMENTDOC || + style == SCE_C_COMMENTLINEDOC || + style == SCE_C_CHARACTER || + style == SCE_C_PREPROCESSOR || + style == SCE_C_STRING) + result = TRUE; + break; + } + case SCLEX_D: + { + if (style == SCE_D_COMMENT || + style == SCE_D_COMMENTLINE || + style == SCE_D_COMMENTDOC || + style == SCE_D_COMMENTLINEDOC || + style == SCE_D_COMMENTNESTED || + style == SCE_D_CHARACTER || + style == SCE_D_STRING) + result = TRUE; + break; + } + case SCLEX_PYTHON: + { + if (style == SCE_P_COMMENTLINE || + style == SCE_P_COMMENTBLOCK || + style == SCE_P_STRING) + result = TRUE; + break; + } + case SCLEX_F77: + { + if (style == SCE_F_COMMENT || + style == SCE_F_STRING1 || + style == SCE_F_STRING2) + result = TRUE; + break; + } + case SCLEX_PERL: + { + if (style == SCE_PL_COMMENTLINE || + style == SCE_PL_STRING) + result = TRUE; + break; + } + case SCLEX_PROPERTIES: + { + if (style == SCE_PROPS_COMMENT) + result = TRUE; + break; + } + case SCLEX_LATEX: + { + if (style == SCE_L_COMMENT) + result = TRUE; + break; + } + case SCLEX_MAKEFILE: + { + if (style == SCE_MAKE_COMMENT) + result = TRUE; + break; + } + case SCLEX_RUBY: + { + if (style == SCE_RB_COMMENTLINE || + style == SCE_RB_STRING) + result = TRUE; + break; + } + case SCLEX_BASH: + { + if (style == SCE_SH_COMMENTLINE || + style == SCE_SH_STRING) + result = TRUE; + break; + } + case SCLEX_SQL: + { + if (style == SCE_SQL_COMMENT || + style == SCE_SQL_COMMENTLINE || + style == SCE_SQL_COMMENTDOC || + style == SCE_SQL_STRING) + result = TRUE; + break; + } + case SCLEX_TCL: + { + if (style == SCE_TCL_COMMENT || + style == SCE_TCL_COMMENTLINE || + style == SCE_TCL_IN_QUOTE) + result = TRUE; + break; + } + case SCLEX_LUA: + { + if (style == SCE_LUA_COMMENT || + style == SCE_LUA_COMMENTLINE || + style == SCE_LUA_COMMENTDOC || + style == SCE_LUA_LITERALSTRING || + style == SCE_LUA_CHARACTER || + style == SCE_LUA_STRING) + result = TRUE; + break; + } + case SCLEX_HASKELL: + { + if (style == SCE_HA_COMMENTLINE || + style == SCE_HA_COMMENTBLOCK || + style == SCE_HA_COMMENTBLOCK2 || + style == SCE_HA_COMMENTBLOCK3 || + style == SCE_HA_CHARACTER || + style == SCE_HA_STRING) + result = TRUE; + break; + } + case SCLEX_HTML: + { + if (style == SCE_HPHP_SIMPLESTRING || + style == SCE_HPHP_HSTRING || + style == SCE_HPHP_COMMENTLINE || + style == SCE_HPHP_COMMENT || + style == SCE_H_DOUBLESTRING || + style == SCE_H_SINGLESTRING || + style == SCE_H_CDATA || + style == SCE_H_COMMENT || + style == SCE_H_SGML_DOUBLESTRING || + style == SCE_H_SGML_SIMPLESTRING || + style == SCE_H_SGML_COMMENT) + result = TRUE; + break; + } + } + + return result; +} + + +#if 0 +gboolean editor_lexer_is_c_like(gint lexer) +{ + switch (lexer) + { + case SCLEX_CPP: + case SCLEX_D: + return TRUE; + + default: + return FALSE; + } +} +#endif + + +// Returns: -1 if lexer doesn't support type keywords +gint editor_lexer_get_type_keyword_idx(gint lexer) +{ + switch (lexer) + { + case SCLEX_CPP: + case SCLEX_D: + return 3; + + default: + return -1; + } +} + + +// inserts a three-line comment at one line above current cursor position +void editor_insert_multiline_comment(gint idx) +{ + gchar *text; + gint text_len; + gint line; + gint pos; + gboolean have_multiline_comment = FALSE; + + if (doc_list[idx].file_type->comment_close != NULL && + strlen(doc_list[idx].file_type->comment_close) > 0) + have_multiline_comment = TRUE; + + // insert three lines one line above of the current position + line = sci_get_line_from_position(doc_list[idx].sci, editor_info.click_pos); + pos = sci_get_position_from_line(doc_list[idx].sci, line); + + // use the indentation on the current line but only when comment indention is used + // and we don't have multi line comment characters + if (doc_list[idx].use_auto_indention && ! have_multiline_comment && + doc_list[idx].file_type->comment_use_indent) + { + get_indent(doc_list[idx].sci, editor_info.click_pos, TRUE); + text = g_strdup_printf("%s\n%s\n%s\n", indent, indent, indent); + text_len = strlen(text); + } + else + { + text = g_strdup("\n\n\n"); + text_len = 3; + } + sci_insert_text(doc_list[idx].sci, pos, text); + g_free(text); + + + // select the inserted lines for commenting + sci_set_selection_start(doc_list[idx].sci, pos); + sci_set_selection_end(doc_list[idx].sci, pos + text_len); + + editor_do_comment(idx, -1, TRUE); + + // set the current position to the start of the first inserted line + pos += strlen(doc_list[idx].file_type->comment_open); + + // on multi line comment jump to the next line, otherwise add the length of added indentation + if (have_multiline_comment) + pos += 1; + else + pos += strlen(indent); + + sci_set_current_position(doc_list[idx].sci, pos, TRUE); + // reset the selection + sci_set_anchor(doc_list[idx].sci, pos); +} + + +/* Scroll the view to make line appear at percent_of_view. + * line can be -1 to use the current position. */ +static void scroll_to_line(ScintillaObject *sci, gint line, gfloat percent_of_view) +{ + gint vis1, los, delta; + GtkWidget *wid = GTK_WIDGET(sci); + + if (! wid->window || ! gdk_window_is_viewable(wid->window)) + return; // prevent gdk_window_scroll warning + + if (line == -1) + line = sci_get_current_line(sci, -1); + + // sci 'visible line' != doc line number because of folding and line wrapping + /* calling SCI_VISIBLEFROMDOCLINE for line is more accurate than calling + * SCI_DOCLINEFROMVISIBLE for vis1. */ + line = SSM(sci, SCI_VISIBLEFROMDOCLINE, line, 0); + vis1 = SSM(sci, SCI_GETFIRSTVISIBLELINE, 0, 0); + los = SSM(sci, SCI_LINESONSCREEN, 0, 0); + delta = (line - vis1) - los * percent_of_view; + sci_scroll_lines(sci, delta); + //sci_scroll_caret(sci); // ensure visible (maybe not needed now) +} + + +void editor_insert_alternative_whitespace(ScintillaObject *sci) +{ + // creates and inserts one tabulator sign or whitespace of the amount of the tab width + gchar *text = utils_get_whitespace(app->pref_editor_tab_width, TRUE); + sci_add_text(sci, text); + g_free(text); +} + + +void editor_select_word(ScintillaObject *sci) +{ + gint pos; + gint start; + gint end; + + g_return_if_fail(sci != NULL); + + pos = SSM(sci, SCI_GETCURRENTPOS, 0, 0); + start = SSM(sci, SCI_WORDSTARTPOSITION, pos, TRUE); + end = SSM(sci, SCI_WORDENDPOSITION, pos, TRUE); + + if (start == end) // caret in whitespaces sequence + { + // look forward but reverse the selection direction, + // so the caret end up stay as near as the original position. + end = SSM(sci, SCI_WORDENDPOSITION, pos, FALSE); + start = SSM(sci, SCI_WORDENDPOSITION, end, TRUE); + if (start == end) + return; + } + + SSM(sci, SCI_SETSEL, start, end); +} + + Copied: trunk/src/editor.h (from rev 1583, trunk/src/sci_cb.h) =================================================================== --- trunk/src/editor.h (rev 0) +++ trunk/src/editor.h 2007-05-28 16:07:30 UTC (rev 1584) @@ -0,0 +1,93 @@ +/* + * editor.h - this file is part of Geany, a fast and lightweight IDE + * + * Copyright 2005-2007 Enrico Tröger <enrico.troeger(a)uvena.de> + * Copyright 2006-2007 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., 675 Mass Ave, Cambridge, MA 02139, USA. + * + */ + +#ifndef GEANY_SCI_CB_H +#define GEANY_SCI_CB_H 1 + +#ifndef PLAT_GTK +# define PLAT_GTK 1 // needed for ScintillaWidget.h +#endif + +#include "Scintilla.h" +#include "ScintillaWidget.h" + +// Note: Avoid using SSM in files not related to scintilla, use sciwrappers.h instead. +#define SSM(s, m, w, l) scintilla_send_message(s, m, w, l) + + +typedef struct +{ + gchar *current_word; // holds word under the mouse or keyboard cursor + gint click_pos; // text position where the mouse was clicked +} EditorInfo; + +extern EditorInfo editor_info; + + +gboolean +on_editor_button_press_event (GtkWidget *widget, + GdkEventButton *event, + gpointer user_data); + +// callback func called by all editors when a signal arises +void on_editor_notification(GtkWidget* editor, gint scn, gpointer lscn, gpointer user_data); + +gboolean editor_start_auto_complete(gint idx, gint pos, gboolean force); + +void editor_close_block(gint idx, gint pos); + +gboolean editor_auto_forif(gint idx, gint pos); + +void editor_auto_latex(gint idx, gint pos); + +void editor_show_macro_list(ScintillaObject *sci); + +/* Reads the word at given cursor position and writes it into the given buffer. The buffer will be + * NULL terminated in any case, even when the word is truncated because wordlen is too small. + * position can be -1, then the current position is used. + * wc are the wordchars to use, if NULL, GEANY_WORDCHARS will be used */ +void editor_find_current_word(ScintillaObject *sci, gint pos, gchar *word, size_t wordlen, + const gchar *wc); + +gboolean editor_show_calltip(gint idx, gint pos); + +void editor_do_comment_toggle(gint idx); + +void editor_do_comment(gint idx, gint line, gboolean allow_empty_lines); + +void editor_do_uncomment(gint idx, gint line); + +void editor_highlight_braces(ScintillaObject *sci, gint cur_pos); + +void editor_auto_table(ScintillaObject *sci, gint pos); + +gboolean editor_lexer_is_c_like(gint lexer); + +gint editor_lexer_get_type_keyword_idx(gint lexer); + +void editor_insert_multiline_comment(gint idx); + +void editor_select_word(ScintillaObject *sci); + +void editor_insert_alternative_whitespace(ScintillaObject *sci); + +#endif Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2007-05-28 15:28:30 UTC (rev 1583) +++ trunk/src/highlighting.c 2007-05-28 16:07:30 UTC (rev 1584) @@ -30,7 +30,7 @@ #include "SciLexer.h" #include "geany.h" #include "highlighting.h" -#include "sci_cb.h" +#include "editor.h" #include "utils.h" #include "filetypes.h" #include "symbols.h" Modified: trunk/src/keybindings.c =================================================================== --- trunk/src/keybindings.c 2007-05-28 15:28:30 UTC (rev 1583) +++ trunk/src/keybindings.c 2007-05-28 16:07:30 UTC (rev 1584) @@ -36,7 +36,7 @@ #include "callbacks.h" #include "prefs.h" #include "msgwindow.h" -#include "sci_cb.h" +#include "editor.h" #include "sciwrappers.h" #include "build.h" #include "tools.h" @@ -617,7 +617,7 @@ gint pos = sci_get_current_position(sci); if (app->pref_editor_auto_complete_constructs) - return sci_cb_auto_forif(idx, pos); + return editor_auto_forif(idx, pos); } } return FALSE; @@ -901,7 +901,7 @@ pos = sci_get_current_position(doc_list[idx].sci); - sci_cb_find_current_word(doc_list[idx].sci, pos, + editor_find_current_word(doc_list[idx].sci, pos, editor_info.current_word, GEANY_MAX_WORD_LENGTH, NULL); if (*editor_info.current_word == 0) @@ -1082,13 +1082,13 @@ on_menu_uncomment_line1_activate(NULL, NULL); break; case GEANY_KEYS_EDIT_AUTOCOMPLETE: - sci_cb_start_auto_complete(idx, sci_get_current_position(doc_list[idx].sci), TRUE); + editor_start_auto_complete(idx, sci_get_current_position(doc_list[idx].sci), TRUE); break; case GEANY_KEYS_EDIT_CALLTIP: - sci_cb_show_calltip(idx, -1); + editor_show_calltip(idx, -1); break; case GEANY_KEYS_EDIT_MACROLIST: - sci_cb_show_macro_list(doc_list[idx].sci); + editor_show_macro_list(doc_list[idx].sci); break; case GEANY_KEYS_EDIT_SUPPRESSCOMPLETION: @@ -1106,10 +1106,10 @@ break; case GEANY_KEYS_EDIT_SELECTWORD: - sci_cb_select_word(doc_list[idx].sci); + editor_select_word(doc_list[idx].sci); break; case GEANY_KEYS_EDIT_INSERTALTWHITESPACE: - sci_cb_insert_alternative_whitespace(doc_list[idx].sci); + editor_insert_alternative_whitespace(doc_list[idx].sci); break; case GEANY_KEYS_EDIT_INCREASEINDENT: on_menu_increase_indent1_activate(NULL, NULL); Modified: trunk/src/main.c =================================================================== --- trunk/src/main.c 2007-05-28 15:28:30 UTC (rev 1583) +++ trunk/src/main.c 2007-05-28 16:07:30 UTC (rev 1584) @@ -52,7 +52,7 @@ #include "treeviews.h" #include "notebook.h" #include "keybindings.h" -#include "sci_cb.h" +#include "editor.h" #include "search.h" #include "build.h" #include "highlighting.h" Modified: trunk/src/makefile.win32 =================================================================== --- trunk/src/makefile.win32 2007-05-28 15:28:30 UTC (rev 1583) +++ trunk/src/makefile.win32 2007-05-28 16:07:30 UTC (rev 1584) @@ -46,7 +46,7 @@ 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 editor.o document.o sciwrappers.o keyfile.o keybindings.o search.o notebook.o \ symbols.o tools.o project.o .c.o: Deleted: trunk/src/sci_cb.c =================================================================== --- trunk/src/sci_cb.c 2007-05-28 15:28:30 UTC (rev 1583) +++ trunk/src/sci_cb.c 2007-05-28 16:07:30 UTC (rev 1584) @@ -1,2296 +0,0 @@ -/* - * sci_cb.c - this file is part of Geany, a fast and lightweight IDE - * - * Copyright 2005-2007 Enrico Tröger <enrico.troeger(a)uvena.de> - * Copyright 2006-2007 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., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * $Id$ - */ - -/* - * Callbacks for the Scintilla widget (ScintillaObject). - * Most important is the sci-notify callback, handled in on_editor_notification(). - * This includes auto-indentation, comments, auto-completion, calltips, etc. - * Also some general Scintilla-related functions. - */ - -#include <ctype.h> -#include <string.h> - -#include "SciLexer.h" -#include "geany.h" - -#include "sci_cb.h" -#include "document.h" -#include "sciwrappers.h" -#include "ui_utils.h" -#include "utils.h" -#include "symbols.h" - - -static gchar current_word[GEANY_MAX_WORD_LENGTH]; // holds word under the mouse or keyboard cursor - -EditorInfo editor_info = {current_word, -1}; - -static struct -{ - gchar *text; - gboolean set; - gchar *last_word; - guint tag_index; -} calltip = {NULL, FALSE, NULL, 0}; - -static gchar indent[100]; - - -static void on_new_line_added(ScintillaObject *sci, gint idx); -static gboolean handle_xml(ScintillaObject *sci, gchar ch, gint idx); -static void get_indent(ScintillaObject *sci, gint pos, gboolean use_this_line); -static void auto_multiline(ScintillaObject *sci, gint pos); -static gboolean is_comment(gint lexer, gint style); -static void scroll_to_line(ScintillaObject *sci, gint line, gfloat percent_of_view); -static void auto_close_bracket(ScintillaObject *sci, gint pos, gchar c); - - -// calls the edit popup menu in the editor -gboolean -on_editor_button_press_event (GtkWidget *widget, - GdkEventButton *event, - gpointer user_data) -{ - gint idx = GPOINTER_TO_INT(user_data); - editor_info.click_pos = sci_get_position_from_xy(doc_list[idx].sci, event->x, event->y, FALSE); - - if (event->button == 1) - { - if (GDK_BUTTON_PRESS==event->type && app->pref_editor_disable_dnd) - { - gint ss = sci_get_selection_start(doc_list[idx].sci); - sci_set_selection_end(doc_list[idx].sci, ss); - } - return utils_check_disk_status(idx, FALSE); - } - - if (event->button == 3) - { - sci_cb_find_current_word(doc_list[idx].sci, editor_info.click_pos, - current_word, sizeof current_word, NULL); - - ui_update_popup_goto_items((current_word[0] != '\0') ? TRUE : FALSE); - ui_update_popup_copy_items(idx); - ui_update_insert_include_item(idx, 0); - gtk_menu_popup(GTK_MENU(app->popup_menu), NULL, NULL, NULL, NULL, event->button, event->time); - - return TRUE; - } - return FALSE; -} - - -typedef struct SCNotification SCNotification; - -static void on_margin_click(ScintillaObject *sci, SCNotification *nt) -{ - // left click to marker margin marks the line - if (nt->margin == 1) - { - gint line = sci_get_line_from_position(sci, nt->position); - gboolean set = sci_is_marker_set_at_line(sci, line, 1); - - //sci_marker_delete_all(doc_list[idx].sci, 1); - sci_set_marker_at_line(sci, line, ! set, 1); // toggle the marker - } - // left click on the folding margin to toggle folding state of current line - else if (nt->margin == 2 && app->pref_editor_folding) - { - gint line = SSM(sci, SCI_LINEFROMPOSITION, nt->position, 0); - - SSM(sci, SCI_TOGGLEFOLD, line, 0); - if (app->pref_editor_unfold_all_children && - SSM(sci, SCI_GETLINEVISIBLE, line + 1, 0)) - { // unfold all children of the current fold point - gint last_line = SSM(sci, SCI_GETLASTCHILD, line, -1); - gint i; - - for (i = line; i < last_line; i++) - { - if (! SSM(sci, SCI_GETLINEVISIBLE, i, 0)) - { - SSM(sci, SCI_TOGGLEFOLD, SSM(sci, SCI_GETFOLDPARENT, i, 0), 0); - } - } - } - } -} - - -static void on_update_ui(gint idx, G_GNUC_UNUSED SCNotification *nt) -{ - ScintillaObject *sci = doc_list[idx].sci; - gint pos = sci_get_current_position(sci); - - // undo / redo menu update - ui_update_popup_reundo_items(idx); - - // brace highlighting - sci_cb_highlight_braces(sci, pos); - - ui_update_statusbar(idx, pos); - - /* Visible lines are only laid out accurately once [SCN_UPDATEUI] is sent, - * so we need to only call sci_scroll_to_line here, because the document - * may have line wrapping and folding enabled. - * http://scintilla.sourceforge.net/ScintillaDoc.html#LineWrapping */ - if (doc_list[idx].scroll_percent > 0.0F) - { - scroll_to_line(sci, -1, doc_list[idx].scroll_percent); - doc_list[idx].scroll_percent = -1.0F; // disable further scrolling - } -#if 0 - /// experimental code for inverting selections - { - gint i; - for (i = SSM(sci, SCI_GETSELECTIONSTART, 0, 0); i < SSM(sci, SCI_GETSELECTIONEND, 0, 0); i++) - { - // need to get colour from getstyleat(), but how? - SSM(sci, SCI_STYLESETFORE, STYLE_DEFAULT, 0); - SSM(sci, SCI_STYLESETBACK, STYLE_DEFAULT, 0); - } - - sci_get_style_at(sci, pos); - } -#endif -} - - -static void on_char_added(gint idx, SCNotification *nt) -{ - ScintillaObject *sci = doc_list[idx].sci; - gint pos = sci_get_current_position(sci); - - switch (nt->ch) - { - case '\r': - { // simple indentation (only for CR format) - if (sci_get_eol_mode(sci) == SC_EOL_CR) - on_new_line_added(sci, idx); - break; - } - case '\n': - { // simple indentation (for CR/LF and LF format) - on_new_line_added(sci, idx); - break; - } - case '>': - case '/': - { // close xml-tags - handle_xml(sci, nt->ch, idx); - break; - } - case '(': - { // show calltips - sci_cb_show_calltip(idx, --pos); - break; - } - case ')': - { // hide calltips - if (SSM(sci, SCI_CALLTIPACTIVE, 0, 0)) - { - SSM(sci, SCI_CALLTIPCANCEL, 0, 0); - } - g_free(calltip.text); - calltip.text = NULL; - calltip.set = FALSE; - break; - } - case '[': - case '{': - { // Tex auto-closing - if (sci_get_lexer(sci) == SCLEX_LATEX) - { - auto_close_bracket(sci, pos, nt->ch); // Tex auto-closing - sci_cb_show_calltip(idx, --pos); - } - break; - } - case '}': - { // closing bracket handling - if (doc_list[idx].use_auto_indention && - app->pref_editor_indention_mode == INDENT_ADVANCED) - sci_cb_close_block(idx, pos - 1); - break; - } - default: sci_cb_start_auto_complete(idx, pos, FALSE); - } -} - - -// callback func called by all editors when a signal arises -void on_editor_notification(GtkWidget *editor, gint scn, gpointer lscn, gpointer user_data) -{ - SCNotification *nt; - ScintillaObject *sci; - gint idx; - - idx = GPOINTER_TO_INT(user_data); - sci = doc_list[idx].sci; - - nt = lscn; - switch (nt->nmhdr.code) - { - case SCN_SAVEPOINTLEFT: - { - doc_list[idx].changed = TRUE; - document_set_text_changed(idx); - break; - } - case SCN_SAVEPOINTREACHED: - { - doc_list[idx].changed = FALSE; - document_set_text_changed(idx); - break; - } - case SCN_MODIFYATTEMPTRO: - { - utils_beep(); - break; - } - case SCN_MARGINCLICK: - on_margin_click(sci, nt); - break; - - case SCN_UPDATEUI: - on_update_ui(idx, nt); - break; - - case SCN_MODIFIED: - { - if (nt->modificationType & SC_STARTACTION && ! app->ignore_callback) - { - // get notified about undo changes - document_undo_add(idx, UNDO_SCINTILLA, NULL); - } - break; - } - case SCN_CHARADDED: - on_char_added(idx, nt); - break; - - case SCN_USERLISTSELECTION: - { - if (nt->listType == 1) - { - gint pos = SSM(sci, SCI_GETCURRENTPOS, 0, 0); - SSM(sci, SCI_INSERTTEXT, pos, (sptr_t) nt->text); - } - else if (nt->listType == 2) - { - gint start, pos = SSM(sci, SCI_GETCURRENTPOS, 0, 0); - start = pos; - while (start > 0 && sci_get_char_at(sci, --start) != '&') ; - - SSM(sci, SCI_INSERTTEXT, pos - 1, (sptr_t) nt->text); - } - break; - } - case SCN_AUTOCSELECTION: - { - // now that autocomplete is finishing, reshow calltips if they were showing - if (calltip.set) - { - gint pos = sci_get_current_position(sci); - SSM(sci, SCI_CALLTIPSHOW, pos, (sptr_t) calltip.text); - // now autocompletion has been cancelled, so do it manually - sci_set_selection_start(sci, nt->lParam); - sci_set_selection_end(sci, pos); - sci_replace_sel(sci, ""); // clear root of word - SSM(sci, SCI_INSERTTEXT, nt->lParam, (sptr_t) nt->text); - sci_goto_pos(sci, nt->lParam + strlen(nt->text), FALSE); - } - break; - } -#ifdef GEANY_DEBUG - case SCN_STYLENEEDED: - { - geany_debug("style"); - break; - } -#endif - case SCN_URIDROPPED: - { - if (nt->text != NULL) - { - document_open_file_list(nt->text, -1); - } - break; - } - case SCN_CALLTIPCLICK: - { - if (nt->position > 0) - { - switch (nt->position) - { - case 1: // up arrow - if (calltip.tag_index > 0) - calltip.tag_index--; - break; - - case 2: calltip.tag_index++; break; // down arrow - } - sci_cb_show_calltip(idx, -1); - } - break; - } - } -} - - -static void on_new_line_added(ScintillaObject *sci, gint idx) -{ - gint pos = sci_get_current_position(sci); - - // simple indentation - if (doc_list[idx].use_auto_indention) - { - get_indent(sci, pos, FALSE); - sci_add_text(sci, indent); - - if (app->pref_editor_indention_mode == INDENT_ADVANCED) - { - // add extra indentation for Python after colon - if (FILETYPE_ID(doc_list[idx].file_type) == GEANY_FILETYPES_PYTHON && - sci_get_char_at(sci, pos - 2) == ':' && - sci_get_style_at(sci, pos - 2) == SCE_P_OPERATOR) - { - // creates and inserts one tabulator sign or whitespace of the amount of the tab width - gchar *text = utils_get_whitespace(app->pref_editor_tab_width, FALSE); - sci_add_text(sci, text); - g_free(text); - } - } - } - - if (app->pref_editor_auto_complete_constructs) - { - // " * " auto completion in multiline C/C++/D/Java comments - auto_multiline(sci, pos); - - sci_cb_auto_latex(idx, pos); - } -} - - -static gboolean lexer_has_braces(ScintillaObject *sci) -{ - gint lexer = SSM(sci, SCI_GETLEXER, 0, 0); - - switch (lexer) - { - case SCLEX_CPP: - case SCLEX_D: - case SCLEX_HTML: // for PHP & JS - case SCLEX_PASCAL: // for multiline comments? - case SCLEX_BASH: - case SCLEX_PERL: - case SCLEX_TCL: - return TRUE; - default: - return FALSE; - } -} - - -// in place indentation of one tab or equivalent spaces -static void do_indent(gchar *buf, gsize len, guint *idx) -{ - guint j = *idx; - - if (app->pref_editor_use_tabs) - { - if (j < len - 1) // leave room for a \0 terminator. - buf[j++] = '\t'; - } - else - { // insert as many spaces as a tab would take - guint k; - for (k = 0; k < (guint) app->pref_editor_tab_width && k < len - 1; k++) - buf[j++] = ' '; - } - *idx = j; -} - - -/* "use_this_line" to auto-indent only if it is a real new line - * and ignore the case of sci_cb_close_block */ -static void get_indent(ScintillaObject *sci, gint pos, gboolean use_this_line) -{ - guint i, len, j = 0; - gint prev_line; - gchar *linebuf; - - prev_line = sci_get_line_from_position(sci, pos); - - if (! use_this_line) prev_line--; - len = sci_get_line_length(sci, prev_line); - linebuf = sci_get_line(sci, prev_line); - - for (i = 0; i < len && j <= (sizeof(indent) - 1); i++) - { - if (linebuf[i] == ' ' || linebuf[i] == '\t') // simple indentation - indent[j++] = linebuf[i]; - else if (app->pref_editor_indention_mode != INDENT_ADVANCED) - break; - else if (use_this_line) - break; - else // sci_cb_close_block - { - if (! lexer_has_braces(sci)) - break; - - if (linebuf[i] == '{') - { - do_indent(indent, sizeof(indent), &j); - break; - } - else - { - gint k = len - 1; - - while (k > 0 && isspace(linebuf[k])) k--; - - // if last non-whitespace character is a { increase indentation by a tab - // e.g. for (...) { - if (linebuf[k] == '{') - { - do_indent(indent, sizeof(indent), &j); - } - break; - } - } - } - indent[j] = '\0'; - g_free(linebuf); -} - - -static void auto_close_bracket(ScintillaObject *sci, gint pos, gchar c) -{ - if (! app->pref_editor_auto_complete_constructs || SSM(sci, SCI_GETLEXER, 0, 0) != SCLEX_LATEX) - return; - - if (c == '[') - { - sci_add_text(sci, "]"); - } - else if (c == '{') - { - sci_add_text(sci, "}"); - } - sci_set_current_position(sci, pos, TRUE); -} - - -/* Finds a corresponding matching brace to the given pos - * (this is taken from Scintilla Editor.cxx, - * fit to work with sci_cb_close_block) */ -static gint brace_match(ScintillaObject *sci, gint pos) -{ - gchar chBrace = sci_get_char_at(sci, pos); - gchar chSeek = utils_brace_opposite(chBrace); - gchar chAtPos; - gint direction = -1; - gint styBrace; - gint depth = 1; - gint styAtPos; - - styBrace = sci_get_style_at(sci, pos); - - if (utils_is_opening_brace(chBrace)) - direction = 1; - - pos = pos + direction; - while ((pos >= 0) && (pos < sci_get_length(sci))) - { - chAtPos = sci_get_char_at(sci, pos - 1); - styAtPos = sci_get_style_at(sci, pos); - - if ((pos > sci_get_end_styled(sci)) || (styAtPos == styBrace)) - { - if (chAtPos == chBrace) - depth++; - if (chAtPos == chSeek) - depth--; - if (depth == 0) - return pos; - } - pos = pos + direction; - } - return -1; -} - - -/* Called after typing '}', if pref_editor_indention_mode is INDENT_ADVANCED. */ -void sci_cb_close_block(gint idx, gint pos) -{ - gint x = 0, cnt = 0; - gint start_brace, line, line_len, eol_char_len; - gchar *text, *line_buf; - ScintillaObject *sci; - - if (idx == -1 || ! doc_list[idx].is_valid || doc_list[idx].file_type == NULL) return; - - sci = doc_list[idx].sci; - - if (! lexer_has_braces(sci)) - return; - - line = sci_get_line_from_position(sci, pos); - line_len = sci_get_line_length(sci, line); - // set eol_char_len to 0 if on last line, because there is no EOL char - eol_char_len = (line == (SSM(sci, SCI_GETLINECOUNT, 0, 0) - 1)) ? 0 : - 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 = sci_get_line(sci, line); - line_buf[line_len - eol_char_len] = '\0'; - while (x < (line_len - eol_char_len)) - { - if (isspace(line_buf[x])) cnt++; - x++; - } - g_free(line_buf); - - if ((line_len - eol_char_len - 1) != cnt) return; - - start_brace = brace_match(sci, pos); // same as sci_find_bracematch (Document::BraceMatch)? - - if (start_brace >= 0) - { - gint line_start; - - get_indent(sci, start_brace, TRUE); - text = g_strconcat(indent, "}", NULL); - line_start = sci_get_position_from_line(sci, line); - sci_set_anchor(sci, line_start); - SSM(sci, SCI_REPLACESEL, 0, (sptr_t) text); - g_free(text); - } - else - if (sci_get_lexer(sci) == SCLEX_HTML || sci_get_lexer(sci) == SCLEX_TCL) - { /* For TCL & PHP brace_match doesn't work here (maybe lexer bugs?), - * so this is a simple workaround. */ - gint line_indent = sci_get_line_indentation(sci, line); - gint last_indent = sci_get_line_indentation(sci, line - 1); - - if (line_indent < last_indent) - return; - line_indent -= app->pref_editor_tab_width; - line_indent = MAX(0, line_indent); - sci_set_line_indentation(sci, line, line_indent); - } -} - - -/* Reads the word at given cursor position and writes it into the given buffer. The buffer will be - * NULL terminated in any case, even when the word is truncated because wordlen is too small. - * position can be -1, then the current position is used. - * wc are the wordchars to use, if NULL, GEANY_WORDCHARS will be used */ -void sci_cb_find_current_word(ScintillaObject *sci, gint pos, gchar *word, size_t wordlen, - const gchar *wc) -{ - gint line, line_start, startword, endword; - gchar *chunk; - - if (pos == -1) - pos = sci_get_current_position(sci); - - line = sci_get_line_from_position(sci, pos); - line_start = sci_get_position_from_line(sci, line); - startword = pos - line_start; - endword = pos - line_start; - - word[0] = '\0'; - chunk = sci_get_line(sci, line); - - if (wc == NULL) - wc = GEANY_WORDCHARS; - - while (startword > 0 && strchr(wc, chunk[startword - 1])) - startword--; - while (chunk[endword] && strchr(wc, chunk[endword])) - endword++; - if(startword == endword) - return; - - chunk[endword] = '\0'; - - g_strlcpy(word, chunk + startword, wordlen); //ensure null terminated - g_free(chunk); -} - - -static gint find_previous_brace(ScintillaObject *sci, gint pos) -{ - gchar c; - gint orig_pos = pos; - - c = SSM(sci, SCI_GETCHARAT, pos, 0); - while (pos >= 0 && pos > orig_pos - 300) - { - c = SSM(sci, SCI_GETCHARAT, pos, 0); - pos--; - if (utils_is_opening_brace(c)) return pos; - } - return -1; -} - - -static gint find_start_bracket(ScintillaObject *sci, gint pos) -{ - gchar c; - gint brackets = 0; - gint orig_pos = pos; - - c = SSM(sci, SCI_GETCHARAT, pos, 0); - while (pos > 0 && pos > orig_pos - 300) - { - c = SSM(sci, SCI_GETCHARAT, pos, 0); - if (c == ')') brackets++; - else if (c == '(') brackets--; - pos--; - if (brackets < 0) return pos; // found start bracket - } - return -1; -} - - -static gboolean append_calltip(GString *str, const TMTag *tag, filetype_id ft_id) -{ - if (! tag->atts.entry.arglist) return FALSE; - - if (tag->atts.entry.var_type) - { - guint i; - - g_string_append(str, tag->atts.entry.var_type); - for (i = 0; i < tag->atts.entry.pointerOrder; i++) - { - g_string_append_c(str, '*'); - } - g_string_append_c(str, ' '); - } - if (tag->atts.entry.scope) - { - const gchar *cosep = symbols_get_context_separator(ft_id); - - g_string_append(str, tag->atts.entry.scope); - g_string_append(str, cosep); - } - g_string_append(str, tag->name); - g_string_append_c(str, ' '); - g_string_append(str, tag->atts.entry.arglist); - - return TRUE; -} - - -static gchar *find_calltip(const gchar *word, filetype *ft) -{ - const GPtrArray *tags; - const gint arg_types = tm_tag_function_t | tm_tag_prototype_t | - tm_tag_method_t | tm_tag_macro_with_arg_t; - TMTagAttrType *attrs = NULL; - TMTag *tag; - GString *str = NULL; - guint i; - - g_return_val_if_fail(ft && word && *word, NULL); - - tags = tm_workspace_find(word, arg_types | tm_tag_class_t, attrs, FALSE, ft->lang); - if (tags->len == 0) - return NULL; - - tag = TM_TAG(tags->pdata[0]); - - if (tag->type == tm_tag_class_t && FILETYPE_ID(ft) == GEANY_FILETYPES_D) - { - // user typed e.g. 'new Classname(' so lookup D constructor Classname::this() - tags = tm_workspace_find_scoped("this", tag->name, - arg_types, attrs, FALSE, ft->lang, TRUE); - if (tags->len == 0) - return NULL; - } - - // remove tags with no argument list - for (i = 0; i < tags->len; i++) - { - tag = TM_TAG(tags->pdata[i]); - - if (! tag->atts.entry.arglist) - tags->pdata[i] = NULL; - } - tm_tags_prune((GPtrArray *) tags); - if (tags->len == 0) - return NULL; - else - { // remove duplicate calltips - TMTagAttrType sort_attr[] = {tm_tag_attr_name_t, tm_tag_attr_scope_t, - tm_tag_attr_arglist_t, 0}; - - tm_tags_sort((GPtrArray *) tags, sort_attr, TRUE); - } - - // if the current word has changed since last time, start with the first tag match - if (! utils_str_equal(word, calltip.last_word)) - calltip.tag_index = 0; - // cache the current word for next time - g_free(calltip.last_word); - calltip.last_word = g_strdup(word); - calltip.tag_index = MIN(calltip.tag_index, tags->len - 1); // ensure tag_index is in range - - for (i = calltip.tag_index; i < tags->len; i++) - { - tag = TM_TAG(tags->pdata[i]); - - if (str == NULL) - { - str = g_string_new(NULL); - if (calltip.tag_index > 0) - g_string_prepend(str, "\001 "); // up arrow - append_calltip(str, tag, FILETYPE_ID(ft)); - } - else // add a down arrow - { - if (calltip.tag_index > 0) // already have an up arrow - g_string_insert_c(str, 1, '\002'); - else - g_string_prepend(str, "\002 "); - break; - } - } - if (str) - { - gchar *result = str->str; - - g_string_free(str, FALSE); - return result; - } - return NULL; -} - - -// use pos = -1 to search for the previous unmatched open bracket. -gboolean sci_cb_show_calltip(gint idx, gint pos) -{ - gint orig_pos = pos; // the position for the calltip - gint lexer; - gint style; - gchar word[GEANY_MAX_WORD_LENGTH]; - gchar *str; - ScintillaObject *sci; - - if (idx == -1 || ! doc_list[idx].is_valid || doc_list[idx].file_type == NULL) return FALSE; - sci = doc_list[idx].sci; - - lexer = SSM(sci, SCI_GETLEXER, 0, 0); - - if (pos == -1) - { - // position of '(' is unknown, so go backwards from current position to find it - pos = SSM(sci, SCI_GETCURRENTPOS, 0, 0); - pos--; - orig_pos = pos; - pos = (lexer == SCLEX_LATEX) ? find_previous_brace(sci, pos) : - find_start_bracket(sci, pos); - if (pos == -1) return FALSE; - } - - style = SSM(sci, SCI_GETSTYLEAT, pos, 0); - if (is_comment(lexer, style)) - return FALSE; - // never show a calltip in a PHP file outside of the <? ?> tags - if (lexer == SCLEX_HTML && ! (style >= SCE_HPHP_DEFAULT && style <= SCE_HPHP_OPERATOR)) - return FALSE; - - word[0] = '\0'; - sci_cb_find_current_word(sci, pos - 1, word, sizeof word, NULL); - if (word[0] == '\0') return FALSE; - - str = find_calltip(word, doc_list[idx].file_type); - if (str) - { - g_free(calltip.text); // free the old calltip - calltip.text = str; - calltip.set = TRUE; - utils_wrap_string(calltip.text, -1); - SSM(sci, SCI_CALLTIPSHOW, orig_pos, (sptr_t) calltip.text); - return TRUE; - } - return FALSE; -} - - -static void show_autocomplete(ScintillaObject *sci, gint rootlen, const gchar *words) -{ - // store whether a calltip is showing, so we can reshow it after autocompletion - calltip.set = SSM(sci, SCI_CALLTIPACTIVE, 0, 0); - SSM(sci, SCI_AUTOCSHOW, rootlen, (sptr_t) words); -} - - -static gboolean -autocomplete_html(ScintillaObject *sci, const gchar *root, gsize rootlen) -{ // HTML entities auto completion - guint i, j = 0; - GString *words; - const gchar **entities = symbols_get_html_entities(); - - if (*root != '&' || entities == NULL) return FALSE; - - words = g_string_sized_new(500); - for (i = 0; ; i++) - { - if (entities[i] == NULL) break; - else if (entities[i][0] == '#') continue; - - if (! strncmp(entities[i], root, rootlen)) - { - if (j++ > 0) g_string_append_c(words, ' '); - g_string_append(words, entities[i]); - } - } - if (words->len > 0) show_autocomplete(sci, rootlen, words->str); - g_string_free(words, TRUE); - return TRUE; -} - - -static gboolean -autocomplete_tags(gint idx, gchar *root, gsize rootlen) -{ // PHP, LaTeX, C, C++, D and Java tag autocompletion - TMTagAttrType attrs[] = { tm_tag_attr_name_t, 0 }; - const GPtrArray *tags; - ScintillaObject *sci; - - if (! DOC_IDX_VALID(idx) || doc_list[idx].file_type == NULL) - return FALSE; - sci = doc_list[idx].sci; - - tags = tm_workspace_find(root, tm_tag_max_t, attrs, TRUE, doc_list[idx].file_type->lang); - if (NULL != tags && tags->len > 0) - { - GString *words = g_string_sized_new(150); - guint j; - - for (j = 0; ((j < tags->len) && (j < GEANY_MAX_AUTOCOMPLETE_WORDS)); ++j) - { - if (j > 0) g_string_append_c(words, ' '); - g_string_append(words, ((TMTag *) tags->pdata[j])->name); - } - show_autocomplete(sci, rootlen, words->str); - g_string_free(words, TRUE); - } - return TRUE; -} - - -gboolean sci_cb_start_auto_complete(gint idx, gint pos, gboolean force) -{ - gint line, line_start, line_len, line_pos, current, rootlen, startword, lexer, style; - gchar *linebuf, *root; - ScintillaObject *sci; - gboolean ret = FALSE; - gchar *wordchars; - filetype *ft; - - if ((! app->pref_editor_auto_complete_symbols && ! force) || - ! DOC_IDX_VALID(idx) || doc_list[idx].file_type == NULL) - return FALSE; - - sci = doc_list[idx].sci; - ft = doc_list[idx].file_type; - - line = sci_get_line_from_position(sci, pos); - line_start = sci_get_position_from_line(sci, line); - line_len = sci_get_line_length(sci, line); - line_pos = pos - line_start - 1; - current = pos - line_start; - startword = current; - lexer = SSM(sci, SCI_GETLEXER, 0, 0); - style = SSM(sci, SCI_GETSTYLEAT, pos, 0); - - // don't autocomplete in comments and strings - if (is_comment(lexer, style)) - return FALSE; - - linebuf = sci_get_line(sci, line); - - if (ft->id == GEANY_FILETYPES_LATEX) - wordchars = GEANY_WORDCHARS"\\"; // add \ to word chars if we are in a LaTeX file - else if (ft->id == GEANY_FILETYPES_HTML || ft->id == GEANY_FILETYPES_PHP) - wordchars = GEANY_WORDCHARS"&"; // add & to word chars if we are in a PHP or HTML file - else - wordchars = GEANY_WORDCHARS; - - // find the start of the current word - while ((startword > 0) && (strchr(wordchars, linebuf[startword - 1]))) - startword--; - linebuf[current] = '\0'; - root = linebuf + startword; - rootlen = current - startword; - - // entity autocompletion always in a HTML file, in a PHP file only when we are outside of <? ?> - if (ft->id == GEANY_FILETYPES_HTML || - (ft->id == GEANY_FILETYPES_PHP && (style < SCE_HPHP_DEFAULT || style > SCE_HPHP_OPERATOR))) - ret = autocomplete_html(sci, root, rootlen); - else - { - // force is set when called by keyboard shortcut, otherwise start at the 4th char - if (force || rootlen >= 4) - ret = autocomplete_tags(idx, root, rootlen); - } - - g_free(linebuf); - return ret; -} - - -void sci_cb_auto_latex(gint idx, gint pos) -{ - ScintillaObject *sci; - - if (idx == -1 || ! doc_list[idx].is_valid || doc_list[idx].file_type == NULL) return; - sci = doc_list[idx].sci; - - if (sci_get_char_at(sci, pos - 2) == '}') - { - gchar *eol, *buf, *construct; - gchar env[50]; - gint line = sci_get_line_from_position(sci, pos - 2); - gint line_len = sci_get_line_length(sci, line); - gint i, start; - - // get the line - buf = sci_get_line(sci, line); - - // get to the first non-blank char (some kind of ltrim()) - start = 0; - //while (isspace(buf[i++])) start++; - while (isspace(buf[start])) start++; - - // check for begin - if (strncmp(buf + start, "\\begin", 6) == 0) - { - gchar full_cmd[15]; - guint j = 0; - - // take also "\begingroup" (or whatever there can be) and append "\endgroup" and so on. - i = start + 6; - 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++; - j++; - } - full_cmd[j] = '\0'; - - // go through the line and get the environment - for (i = start + j; i < line_len; i++) - { - if (buf[i] == '{') - { - j = 0; - i++; @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1583] trunk
by ntrel＠users.sourceforge.net 28 May '07

28 May '07

Revision: 1583 http://svn.sourceforge.net/geany/?rev=1583&view=rev Author: ntrel Date: 2007-05-28 08:28:30 -0700 (Mon, 28 May 2007) Log Message: ----------- Force debug mode for a SVN working copy. Modified Paths: -------------- trunk/ChangeLog trunk/configure.in trunk/src/Makefile.am Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-05-28 15:24:21 UTC (rev 1582) +++ trunk/ChangeLog 2007-05-28 15:28:30 UTC (rev 1583) @@ -2,6 +2,8 @@ * src/project.c, src/document.c, src/ui_utils.c: Show current project name in window title. + * configure.in, src/Makefile.am: + Force debug mode for a SVN working copy. 2007-05-26 Nick Treleaven <nick.treleaven(a)btinternet.com> Modified: trunk/configure.in =================================================================== --- trunk/configure.in 2007-05-28 15:24:21 UTC (rev 1582) +++ trunk/configure.in 2007-05-28 15:28:30 UTC (rev 1583) @@ -59,6 +59,8 @@ if test -d ".svn" -a "x${SVN}" != "x" -a -x "${SVN}" then REVISION=r`$SVN info|grep 'Last Changed Rev'|cut -d' ' -f4` + # force debug mode for a SVN working copy + CFLAGS="-g -DGEANY_DEBUG $CFLAGS" else REVISION="-1" fi Modified: trunk/src/Makefile.am =================================================================== --- trunk/src/Makefile.am 2007-05-28 15:24:21 UTC (rev 1582) +++ trunk/src/Makefile.am 2007-05-28 15:28:30 UTC (rev 1583) @@ -45,7 +45,6 @@ $(INTLLIBS) -lgdi32 -limm32 -lshell32 -lole32 -luuid -liberty -lcomdlg32 -lcomctl32 \ geany_private.res AM_CFLAGS = -Wall -pipe -mms-bitfields -#AM_CFLAGS = -DGEANY_DEBUG -Wall -pipe -mms-bitfields -g -O0 geany_LDFLAGS = -mwindows INCLUDES = -I$(srcdir)/../scintilla/include -I$(srcdir)/../tagmanager/include -DENABLE_NLS \ @@ -60,7 +59,6 @@ else # build Geany for all other platforms AM_CFLAGS = -Wall -pipe -#AM_CFLAGS = -DGEANY_DEBUG -Wall -pipe -g -O0 geany_SOURCES = $(SRCS) vte.c vte.h geany_LDADD = ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a @PACKAGE_LIBS@ -lstdc++ $(INTLLIBS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1582] trunk
by ntrel＠users.sourceforge.net 28 May '07

28 May '07

Revision: 1582 http://svn.sourceforge.net/geany/?rev=1582&view=rev Author: ntrel Date: 2007-05-28 08:24:21 -0700 (Mon, 28 May 2007) Log Message: ----------- Show current project name in window title. Modified Paths: -------------- trunk/ChangeLog trunk/src/document.c trunk/src/project.c trunk/src/ui_utils.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-05-26 15:35:22 UTC (rev 1581) +++ trunk/ChangeLog 2007-05-28 15:24:21 UTC (rev 1582) @@ -1,3 +1,9 @@ +2007-05-28 Nick Treleaven <nick.treleaven(a)btinternet.com> + + * src/project.c, src/document.c, src/ui_utils.c: + Show current project name in window title. + + 2007-05-26 Nick Treleaven <nick.treleaven(a)btinternet.com> * src/treeviews.c, src/filetypes.c, src/filetypes.h, src/document.c: @@ -2,2 +8,4 @@ Replace filetype::has_tags member with filetype_has_tags(). + * HACKING: + Add note about Adding a TagManager parser. Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2007-05-26 15:35:22 UTC (rev 1581) +++ trunk/src/document.c 2007-05-28 15:24:21 UTC (rev 1582) @@ -148,12 +148,16 @@ gint document_get_cur_idx() { gint cur_page = gtk_notebook_get_current_page(GTK_NOTEBOOK(app->notebook)); - ScintillaObject *sci = (ScintillaObject*)gtk_notebook_get_nth_page(GTK_NOTEBOOK(app->notebook), cur_page); if (cur_page == -1) return -1; else + { + ScintillaObject *sci = (ScintillaObject*) + gtk_notebook_get_nth_page(GTK_NOTEBOOK(app->notebook), cur_page); + return document_find_by_sci(sci); + } } Modified: trunk/src/project.c =================================================================== --- trunk/src/project.c 2007-05-26 15:35:22 UTC (rev 1581) +++ trunk/src/project.c 2007-05-28 15:24:21 UTC (rev 1582) @@ -277,6 +277,14 @@ } +// Called when opening, closing and updating projects. +static void update_ui() +{ + ui_set_window_title(-1); + build_menu_update(-1); +} + + void project_close() { g_return_if_fail(app->project != NULL); @@ -295,7 +303,7 @@ g_free(app->project); app->project = NULL; - build_menu_update(-1); + update_ui(); } @@ -474,7 +482,7 @@ if (! update_config(e)) goto retry; // successfully updated properties - build_menu_update(-1); + update_ui(); } gtk_widget_destroy(e->dialog); @@ -807,7 +815,7 @@ g_key_file_free(config); - build_menu_update(-1); + update_ui(); return TRUE; } Modified: trunk/src/ui_utils.c =================================================================== --- trunk/src/ui_utils.c 2007-05-26 15:35:22 UTC (rev 1581) +++ trunk/src/ui_utils.c 2007-05-28 15:24:21 UTC (rev 1582) @@ -40,6 +40,7 @@ #include "images.c" #include "treeviews.h" #include "win32.h" +#include "project.h" static gchar *menu_item_get_text(GtkMenuItem *menu_item); @@ -149,32 +150,42 @@ /* This sets the window title according to the current filename. */ void ui_set_window_title(gint idx) { - gchar *title; + GString *str; + GeanyProject *project = app->project; + if (idx < 0) + idx = document_get_cur_idx(); + + str = g_string_new(NULL); + if (idx >= 0) { + g_string_append(str, doc_list[idx].changed ? "*" : ""); + if (doc_list[idx].file_name == NULL) - { - title = g_strdup_printf("%s%s - Geany", - doc_list[idx].changed ? "*" : "", - DOC_FILENAME(idx)); - } + g_string_append(str, DOC_FILENAME(idx)); else { gchar *basename = g_path_get_basename(DOC_FILENAME(idx)); gchar *dirname = g_path_get_dirname(DOC_FILENAME(idx)); - title = g_strdup_printf("%s%s - %s - Geany", - doc_list[idx].changed ? "*" : "", - basename, dirname ? dirname : ""); + g_string_append(str, basename); + g_string_append(str, " - "); + g_string_append(str, dirname ? dirname : ""); g_free(basename); g_free(dirname); } - gtk_window_set_title(GTK_WINDOW(app->window), title); - g_free(title); + g_string_append(str, " - "); } - else - gtk_window_set_title(GTK_WINDOW(app->window), "Geany"); + if (project) + { + g_string_append_c(str, '['); + g_string_append(str, project->name); + g_string_append(str, "] - "); + } + g_string_append(str, "Geany"); + gtk_window_set_title(GTK_WINDOW(app->window), str->str); + g_string_free(str, TRUE); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1581] trunk/HACKING
by ntrel＠users.sourceforge.net 26 May '07

26 May '07

Revision: 1581 http://svn.sourceforge.net/geany/?rev=1581&view=rev Author: ntrel Date: 2007-05-26 08:35:22 -0700 (Sat, 26 May 2007) Log Message: ----------- Add note about Adding a TagManager parser. Modified Paths: -------------- trunk/HACKING Modified: trunk/HACKING =================================================================== --- trunk/HACKING 2007-05-26 15:26:05 UTC (rev 1580) +++ trunk/HACKING 2007-05-26 15:35:22 UTC (rev 1581) @@ -52,3 +52,27 @@ http://ctags.sf.net). +NOTES +===== + +Adding a TagManager parser +-------------------------- +This assumes the Geany filetype already exists. + +First write or find a CTags compatible parser, foo.c. Note that there are +some unapplied language patches for CTags at: +http://sf.net/projects/ctags - see the tracker. + +Add foo.c to Makefile.am. +Add foo.o to makefile.win32. +Add Foo to parsers.h & fill in comment with parser number for foo. + +In foo.c: +Edit FooKinds 3rd column to match a s_tag_type_names string in tm_tag.c. + +In filetypes.c, filetypes_init_types(): +set filetypes[GEANY_FILETYPES_FOO].lang = foo's parser number. + +In symbols.c: +Update init_tag_list() for foo, listing the tm_tag_* types corresponding +to the s_tag_type_names strings used in foo.c for FooKinds. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1580] trunk/src
by ntrel＠users.sourceforge.net 26 May '07

26 May '07

Revision: 1580 http://svn.sourceforge.net/geany/?rev=1580&view=rev Author: ntrel Date: 2007-05-26 08:26:05 -0700 (Sat, 26 May 2007) Log Message: ----------- Use filetype_has_tags(). Modified Paths: -------------- trunk/src/filetypes.c trunk/src/symbols.c Modified: trunk/src/filetypes.c =================================================================== --- trunk/src/filetypes.c 2007-05-26 15:09:06 UTC (rev 1579) +++ trunk/src/filetypes.c 2007-05-26 15:26:05 UTC (rev 1580) @@ -900,6 +900,8 @@ // Indicates whether there is a tag parser for the filetype or not. gboolean filetype_has_tags(filetype *ft) { + g_return_val_if_fail(ft != NULL, FALSE); + return ft->lang >= 0; } Modified: trunk/src/symbols.c =================================================================== --- trunk/src/symbols.c 2007-05-26 15:09:06 UTC (rev 1579) +++ trunk/src/symbols.c 2007-05-26 15:26:05 UTC (rev 1580) @@ -693,7 +693,7 @@ } g_free(shortname); - if (filetypes[FILETYPE_ID(ft)]->lang < 0) + if (ft == NULL || ! filetype_has_tags(ft)) return NULL; return 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: [1579] trunk
by eht16＠users.sourceforge.net 26 May '07

26 May '07

Revision: 1579 http://svn.sourceforge.net/geany/?rev=1579&view=rev Author: eht16 Date: 2007-05-26 08:09:06 -0700 (Sat, 26 May 2007) Log Message: ----------- Use current locale as default encoding for new files. Don't keep comments in configuration file to work around a bug in newer GLib versions. If config file doesn't exist, try to load a global one from $prefix/share/geany/. Don't create an empty geany.conf as write test, use access() instead. Modified Paths: -------------- trunk/ChangeLog trunk/src/keyfile.c trunk/src/utils.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-05-26 12:13:53 UTC (rev 1578) +++ trunk/ChangeLog 2007-05-26 15:09:06 UTC (rev 1579) @@ -8,6 +8,14 @@ * src/filetypes.c: Ignore case of filename extensions on Windows. * src/ui_utils.c: Add missing header file. + * src/keyfile.c: + Use current locale as default encoding for new files. + Don't keep comments in configuration file to work around a bug in + newer GLib versions. + If config file doesn't exist, try to load a global one from + $prefix/share/geany/. + * src/utils.c: + Don't create an empty geany.conf as write test, use access() instead. 2007-05-25 Enrico Tröger <enrico.troeger(a)uvena.de> Modified: trunk/src/keyfile.c =================================================================== --- trunk/src/keyfile.c 2007-05-26 12:13:53 UTC (rev 1578) +++ trunk/src/keyfile.c 2007-05-26 15:09:06 UTC (rev 1579) @@ -138,22 +138,14 @@ void configuration_save() { - gboolean config_exists; GKeyFile *config = g_key_file_new(); gchar *configfile = g_strconcat(app->configdir, G_DIR_SEPARATOR_S, "geany.conf", NULL); gchar *data; GtkTextBuffer *buffer; GtkTextIter start, end; - config_exists = g_key_file_load_from_file(config, configfile, G_KEY_FILE_KEEP_COMMENTS, NULL); + g_key_file_load_from_file(config, configfile, 0, NULL); - if (!config_exists) - { - gchar *start_comm = g_strdup_printf(_("%s configuration file, edit as you need"), PACKAGE); - g_key_file_set_comment(config, NULL, NULL, start_comm, NULL); - g_free(start_comm); - } - // gets the text from the scribble textview buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(lookup_widget(app->window, "textview_scribble"))); gtk_text_buffer_get_bounds(buffer, &start, &end); @@ -350,16 +342,23 @@ gboolean configuration_load() { - gboolean config_exists; guint geo_len; gint *geo; gchar *configfile = g_strconcat(app->configdir, G_DIR_SEPARATOR_S, "geany.conf", NULL); gchar *tmp_string, *tmp_string2; + const gchar *default_charset = NULL; GKeyFile *config = g_key_file_new(); GError *error = NULL; - config_exists = g_key_file_load_from_file(config, configfile, G_KEY_FILE_KEEP_COMMENTS, NULL); + if (! g_file_test(configfile, G_FILE_TEST_IS_REGULAR | G_FILE_TEST_IS_SYMLINK)) + { // config file does not (yet) exist, so try to load a global config file which may be + // created by distributors + geany_debug("No config file found, try to use global configuration."); + setptr(configfile, g_strconcat(app->datadir, G_DIR_SEPARATOR_S "geany.conf", NULL)); + } + g_key_file_load_from_file(config, configfile, 0, NULL); + app->toolbar_visible = utils_get_setting_boolean(config, PACKAGE, "pref_toolbar_show", TRUE); { GtkIconSize tb_iconsize; @@ -435,8 +434,10 @@ app->pref_editor_tab_width = utils_get_setting_integer(config, PACKAGE, "pref_editor_tab_width", 4); app->pref_editor_use_tabs = utils_get_setting_boolean(config, PACKAGE, "pref_editor_use_tabs", TRUE); + // use current locale encoding as default for new files (should be in most cases UTF-8) + g_get_charset(&default_charset); tmp_string = utils_get_setting_string(config, PACKAGE, "pref_editor_default_encoding", - encodings[GEANY_ENCODING_UTF_8].charset); + default_charset); if (tmp_string) { const GeanyEncoding *enc = encodings_get_from_charset(tmp_string); Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2007-05-26 12:13:53 UTC (rev 1578) +++ trunk/src/utils.c 2007-05-26 15:09:06 UTC (rev 1579) @@ -810,13 +810,7 @@ if (error_nr == 0 && ! g_file_test(conf_file, G_FILE_TEST_EXISTS)) { // try to write geany.conf - error_nr = utils_write_file(conf_file, ""); - - if (error_nr == 0 && ! g_file_test(conf_file, G_FILE_TEST_EXISTS)) - { // check whether write test was successful, otherwise directory is not writable - geany_debug("The chosen configuration directory is not writable."); - errno = EPERM; - } + error_nr = access(app->configdir, W_OK); } // make subdir for filetype definitions This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits May 2007