Commits July 2008

commits@lists.geany.org

3 participants
105 discussions

SF.net SVN: geany: [2784] trunk/src/document.c
by eht16＠users.sourceforge.net 15 Jul '08

15 Jul '08

Revision: 2784 http://geany.svn.sourceforge.net/geany/?rev=2784&view=rev Author: eht16 Date: 2008-07-15 11:51:19 -0700 (Tue, 15 Jul 2008) Log Message: ----------- Fix compiler warning because of missing cast, oops. Modified Paths: -------------- trunk/src/document.c Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2008-07-15 18:46:17 UTC (rev 2783) +++ trunk/src/document.c 2008-07-15 18:51:19 UTC (rev 2784) @@ -428,7 +428,7 @@ ui_document_buttons_update(); - gtk_widget_grab_focus(this->editor->sci); + gtk_widget_grab_focus(GTK_WIDGET(this->editor->sci)); this->is_valid = TRUE; /* do this last to prevent UI updating with NULL items. */ return this; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

15 Jul '08

Revision: 2783 http://geany.svn.sourceforge.net/geany/?rev=2783&view=rev Author: eht16 Date: 2008-07-15 11:46:17 -0700 (Tue, 15 Jul 2008) Log Message: ----------- Enforce focus grabbing when creating new documents (closes #2018427). Modified Paths: -------------- trunk/ChangeLog trunk/src/document.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-07-15 18:36:37 UTC (rev 2782) +++ trunk/ChangeLog 2008-07-15 18:46:17 UTC (rev 2783) @@ -3,6 +3,8 @@ * data/filetypes.fortran: Add missing keywords: 'elemental', 'pure' and 'procedure' which also fix broken folding (patch by Henrik Holst, thanks). + * src/document.c: + Enforce focus grabbing when creating new documents (closes #2018427). 2008-07-15 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2008-07-15 18:36:37 UTC (rev 2782) +++ trunk/src/document.c 2008-07-15 18:46:17 UTC (rev 2783) @@ -428,6 +428,8 @@ ui_document_buttons_update(); + gtk_widget_grab_focus(this->editor->sci); + this->is_valid = TRUE; /* do this last to prevent UI updating with NULL items. */ return this; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

15 Jul '08

Revision: 2782 http://geany.svn.sourceforge.net/geany/?rev=2782&view=rev Author: eht16 Date: 2008-07-15 11:36:37 -0700 (Tue, 15 Jul 2008) Log Message: ----------- Add missing keywords: 'elemental', 'pure' and 'procedure' which also fix broken folding (patch by Henrik Holst, thanks). Modified Paths: -------------- trunk/ChangeLog trunk/data/filetypes.fortran Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-07-15 17:16:28 UTC (rev 2781) +++ trunk/ChangeLog 2008-07-15 18:36:37 UTC (rev 2782) @@ -1,3 +1,10 @@ +2008-07-15 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * data/filetypes.fortran: + Add missing keywords: 'elemental', 'pure' and 'procedure' which also + fix broken folding (patch by Henrik Holst, thanks). + + 2008-07-15 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * src/build.c, src/utils.c, src/utils.h, src/keybindings.c, Modified: trunk/data/filetypes.fortran =================================================================== --- trunk/data/filetypes.fortran 2008-07-15 17:16:28 UTC (rev 2781) +++ trunk/data/filetypes.fortran 2008-07-15 18:36:37 UTC (rev 2782) @@ -21,7 +21,7 @@ [keywords] # all items must be in one line -primary=access action advance allocatable allocate apostrophe assign assignment associate asynchronous backspace bind blank blockdata call case character class close common complex contains continue cycle data deallocate decimal delim default dimension direct do dowhile double doubleprecision else elseif elsewhere encoding end endassociate endblockdata enddo endfile endforall endfunction endif endinterface endmodule endprogram endselect endsubroutine endtype endwhere entry eor equivalence err errmsg exist exit external file flush fmt forall form format formatted function go goto id if implicit in include inout integer inquire intent interface intrinsic iomsg iolength iostat kind len logical module name named namelist nextrec nml none nullify number only open opened operator optional out pad parameter pass pause pending pointer pos position precision print private program protected public quote read readwrite real rec recl recursive result return rewind save select selectcase selecttype sequential sign size stat status stop stream subroutine target then to type unformatted unit use value volatile wait where while write +primary=access action advance allocatable allocate apostrophe assign assignment associate asynchronous backspace bind blank blockdata call case character class close common complex contains continue cycle data deallocate decimal delim default dimension direct do dowhile double doubleprecision elemental else elseif elsewhere encoding end endassociate endblockdata enddo endfile endforall endfunction endif endinterface endmodule endprogram endselect endsubroutine endtype endwhere entry eor equivalence err errmsg exist exit external file flush fmt forall form format formatted function go goto id if implicit in include inout integer inquire intent interface intrinsic iomsg iolength iostat kind len logical module name named namelist nextrec nml none nullify number only open opened operator optional out pad parameter pass pause pending pointer pos position precision print private procedure program protected public quote pure read readwrite real rec recl recursive result return rewind save select selectcase selecttype sequential sign size stat status stop stream subroutine target then to type unformatted unit use value volatile wait where while write intrinsic_functions=abs achar acos acosd adjustl adjustr aimag aimax0 aimin0 aint ajmax0 ajmin0 akmax0 akmin0 all allocated alog alog10 amax0 amax1 amin0 amin1 amod anint any asin asind associated atan atan2 atan2d atand bitest bitl bitlr bitrl bjtest bit_size bktest break btest cabs ccos cdabs cdcos cdexp cdlog cdsin cdsqrt ceiling cexp char clog cmplx conjg cos cosd cosh count cpu_time cshift csin csqrt dabs dacos dacosd dasin dasind datan datan2 datan2d datand date date_and_time dble dcmplx dconjg dcos dcosd dcosh dcotan ddim dexp dfloat dflotk dfloti dflotj digits dim dimag dint dlog dlog10 dmax1 dmin1 dmod dnint dot_product dprod dreal dsign dsin dsind dsinh dsqrt dtan dtand dtanh eoshift epsilon errsns exp exponent float floati floatj floatk floor fraction free huge iabs iachar iand ibclr ibits ibset ichar idate idim idint idnint ieor ifix iiabs iiand iibclr iibits iibset iidim iidint iidnnt iieor iifix iint iior iiqint iiqnnt iishft iishftc iisign ilen imax0 imax1 imin0 imin1 imod index inint inot int int1 int2 int4 int8 iqint iqnint ior ishft ishftc isign isnan izext jiand jibclr jibits jibset jidim jidint jidnnt jieor jifix jint jior jiqint jiqnnt jishft jishftc jisign jmax0 jmax1 jmin0 jmin1 jmod jnint jnot jzext kiabs kiand kibclr kibits kibset kidim kidint kidnnt kieor kifix kind kint kior kishft kishftc kisign kmax0 kmax1 kmin0 kmin1 kmod knint knot kzext lbound leadz len len_trim lenlge lge lgt lle llt log log10 logical lshift malloc matmul max max0 max1 maxexponent maxloc maxval merge min min0 min1 minexponent minloc minval mod modulo mvbits nearest nint not nworkers number_of_processors pack popcnt poppar precision present product radix random random_number random_seed range real repeat reshape rrspacing rshift scale scan secnds selected_int_kind selected_real_kind set_exponent shape sign sin sind sinh size sizeof sngl snglq spacing spread sqrt sum system_clock tan tand tanh tiny transfer transpose trim ubound unpack verify user_functions=cdabs cdcos cdexp cdlog cdsin cdsqrt cotan cotand dcmplx dconjg dcotan dcotand decode dimag dll_export dll_import doublecomplex dreal dvchk encode find flen flush getarg getcharqq getcl getdat getenv gettim hfix ibchng identifier imag int1 int2 int4 intc intrup invalop iostat_msg isha ishc ishl jfix lacfar locking locnear map nargs nbreak ndperr ndpexc offset ovefl peekcharqq precfill prompt qabs qacos qacosd qasin qasind qatan qatand qatan2 qcmplx qconjg qcos qcosd qcosh qdim qexp qext qextd qfloat qimag qlog qlog10 qmax1 qmin1 qmod qreal qsign qsin qsind qsinh qsqrt qtan qtand qtanh ran rand randu rewrite segment setdat settim system timer undfl unlock union val virtual volatile zabs zcos zexp zlog zsin zsqrt This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2781] trunk
by ntrel＠users.sourceforge.net 15 Jul '08

15 Jul '08

Revision: 2781 http://geany.svn.sourceforge.net/geany/?rev=2781&view=rev Author: ntrel Date: 2008-07-15 10:16:28 -0700 (Tue, 15 Jul 2008) Log Message: ----------- Prevent warning when trying to load an active plugin at startup that doesn't exist on disk any more. Modified Paths: -------------- trunk/ChangeLog trunk/src/plugins.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-07-15 14:50:06 UTC (rev 2780) +++ trunk/ChangeLog 2008-07-15 17:16:28 UTC (rev 2781) @@ -30,6 +30,9 @@ * plugins/filebrowser.c: Show '..' item when the current folder is empty (fixes #2015121). Replace is_top_level_directory() code by checking g_path_skip_root(). + * src/plugins.c: + Prevent warning when trying to load an active plugin at startup that + doesn't exist on disk any more. 2008-07-14 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/src/plugins.c =================================================================== --- trunk/src/plugins.c 2008-07-15 14:50:06 UTC (rev 2780) +++ trunk/src/plugins.c 2008-07-15 17:16:28 UTC (rev 2781) @@ -676,7 +676,7 @@ { const gchar *fname = active_plugins_pref[i]; - if (NZV(fname)) + if (NZV(fname) && g_file_test(fname, G_FILE_TEST_EXISTS)) { if (plugin_new(fname, TRUE, FALSE) == NULL) failed_plugins_list = g_list_append(failed_plugins_list, g_strdup(fname)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2780] trunk
by ntrel＠users.sourceforge.net 15 Jul '08

15 Jul '08

Revision: 2780 http://geany.svn.sourceforge.net/geany/?rev=2780&view=rev Author: ntrel Date: 2008-07-15 07:50:06 -0700 (Tue, 15 Jul 2008) Log Message: ----------- Show '..' item when the current folder is empty (fixes #2015121). Replace is_top_level_directory() code by checking g_path_skip_root(). Modified Paths: -------------- trunk/ChangeLog trunk/plugins/filebrowser.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-07-15 14:29:41 UTC (rev 2779) +++ trunk/ChangeLog 2008-07-15 14:50:06 UTC (rev 2780) @@ -27,6 +27,9 @@ gradually or as required). Move utils_get_current_function() to symbols.c. Move utils_replace_filename() to document.c. + * plugins/filebrowser.c: + Show '..' item when the current folder is empty (fixes #2015121). + Replace is_top_level_directory() code by checking g_path_skip_root(). 2008-07-14 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/plugins/filebrowser.c =================================================================== --- trunk/plugins/filebrowser.c 2008-07-15 14:29:41 UTC (rev 2779) +++ trunk/plugins/filebrowser.c 2008-07-15 14:50:06 UTC (rev 2780) @@ -63,13 +63,6 @@ PLUGIN_KEY_GROUP(file_browser, KB_COUNT) -/* number of characters to skip the root of an absolute path("c:" or "d:" on Windows) */ -#ifdef G_OS_WIN32 -# define ROOT_OFFSET 2 -#else -# define ROOT_OFFSET 0 -#endif - enum { FILEVIEW_COLUMN_ICON = 0, @@ -188,21 +181,13 @@ } -static gboolean is_top_level_directory(const gchar *dir) -{ - g_return_val_if_fail(dir && strlen(dir) > ROOT_OFFSET, FALSE); - - return (p_utils->str_equal(dir + ROOT_OFFSET, G_DIR_SEPARATOR_S)); -} - - /* adds ".." to the start of the file list */ static void add_top_level_entry(void) { GtkTreeIter iter; - if (is_top_level_directory(current_dir)) - return; + if (! NZV(g_path_skip_root(current_dir))) + return; /* ignore 'C:\' or '/' */ gtk_list_store_prepend(file_store, &iter); last_dir_iter = gtk_tree_iter_copy(&iter); @@ -239,10 +224,11 @@ gtk_entry_set_text(GTK_ENTRY(path_entry), utf8_dir); g_free(utf8_dir); + add_top_level_entry(); /* ".." item */ + list = p_utils->get_file_list(current_dir, NULL, NULL); if (list != NULL) { - add_top_level_entry(); g_slist_foreach(list, (GFunc) add_item, NULL); g_slist_foreach(list, (GFunc) g_free, NULL); g_slist_free(list); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2779] trunk
by ntrel＠users.sourceforge.net 15 Jul '08

15 Jul '08

Revision: 2779 http://geany.svn.sourceforge.net/geany/?rev=2779&view=rev Author: ntrel Date: 2008-07-15 07:29:41 -0700 (Tue, 15 Jul 2008) Log Message: ----------- Merge the editor-struct branch: Note: this breaks the plugin API for editor-related document fields and functions. Split new GeanyEditor struct type from GeanyDocument fields sci, line_wrapping, auto_indent, scroll_percent, use_tabs, line_breaking. GeanyEditor::document allows access back to document fields. Add GeanyDocument::editor field; this is only valid when the document is valid, and NULL otherwise. This means any checks for doc->editor->scintilla != NULL will segfault for invalid documents - check against doc->is_valid or doc->editor != NULL instead. Change plugin API EditorFuncs to use GeanyEditor pointers. Make editor_set_font() take a pango-style font string, and use a GeanyEditor pointer. Use GeanyEditor* instead of GeanyDocument* in editor.c (most global editor functions still need conversion though, but this may be done gradually or as required). Move utils_get_current_function() to symbols.c. Move utils_replace_filename() to document.c. Modified Paths: -------------- trunk/ChangeLog trunk/plugins/classbuilder.c trunk/plugins/export.c trunk/plugins/htmlchars.c trunk/plugins/vcdiff.c trunk/src/build.c trunk/src/callbacks.c trunk/src/document.c trunk/src/document.h trunk/src/editor.c trunk/src/editor.h trunk/src/filetypes.c trunk/src/keybindings.c trunk/src/keyfile.c trunk/src/main.c trunk/src/msgwindow.c trunk/src/navqueue.c trunk/src/notebook.c trunk/src/plugindata.h trunk/src/prefs.c trunk/src/printing.c trunk/src/search.c trunk/src/symbols.c trunk/src/symbols.h trunk/src/tools.c trunk/src/treeviews.c trunk/src/ui_utils.c trunk/src/utils.c trunk/src/utils.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-07-14 23:43:21 UTC (rev 2778) +++ trunk/ChangeLog 2008-07-15 14:29:41 UTC (rev 2779) @@ -1,3 +1,34 @@ +2008-07-15 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/build.c, src/utils.c, src/utils.h, src/keybindings.c, + src/printing.c, src/tools.c, src/prefs.c, src/navqueue.c, + src/plugindata.h, src/treeviews.c, src/msgwindow.c, src/callbacks.c, + src/notebook.c, src/keyfile.c, src/filetypes.c, src/search.c, + src/document.c, src/document.h, src/main.c, src/editor.c, + src/symbols.c, src/editor.h, src/symbols.h, src/ui_utils.c, + plugins/export.c, plugins/vcdiff.c, plugins/htmlchars.c, + plugins/classbuilder.c: + Merge the editor-struct branch: + Note: this breaks the plugin API for editor-related document fields + and functions. + Split new GeanyEditor struct type from GeanyDocument fields sci, + line_wrapping, auto_indent, scroll_percent, use_tabs, line_breaking. + GeanyEditor::document allows access back to document fields. + Add GeanyDocument::editor field; this is only valid when the + document is valid, and NULL otherwise. This means any checks for + doc->editor->scintilla != NULL will segfault for invalid + documents - check against doc->is_valid or doc->editor != NULL + instead. + Change plugin API EditorFuncs to use GeanyEditor pointers. + Make editor_set_font() take a pango-style font string, and use a + GeanyEditor pointer. + Use GeanyEditor* instead of GeanyDocument* in editor.c (most global + editor functions still need conversion though, but this may be done + gradually or as required). + Move utils_get_current_function() to symbols.c. + Move utils_replace_filename() to document.c. + + 2008-07-14 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * data/filetype_extensions.conf, data/filetypes.f77, Modified: trunk/plugins/classbuilder.c =================================================================== --- trunk/plugins/classbuilder.c 2008-07-14 23:43:21 UTC (rev 2778) +++ trunk/plugins/classbuilder.c 2008-07-15 14:29:41 UTC (rev 2779) @@ -30,6 +30,7 @@ #include "support.h" #include "filetypes.h" #include "document.h" +#include "editor.h" #include "ui_utils.h" #include "pluginmacros.h" @@ -732,7 +733,7 @@ { text = get_template_class_source(class_info); doc = p_document->new_file(class_info->source, NULL, NULL); - p_sci->set_text(doc->sci, text); + p_sci->set_text(doc->editor->sci, text); g_free(text); } @@ -740,7 +741,7 @@ { text = get_template_class_header(class_info); doc = p_document->new_file(class_info->header, NULL, NULL); - p_sci->set_text(doc->sci, text); + p_sci->set_text(doc->editor->sci, text); g_free(text); } Modified: trunk/plugins/export.c =================================================================== --- trunk/plugins/export.c 2008-07-14 23:43:21 UTC (rev 2778) +++ trunk/plugins/export.c 2008-07-15 14:29:41 UTC (rev 2779) @@ -357,25 +357,25 @@ GString *body; GString *cmds; GString *latex; - gint style_max = pow(2, p_sci->send_message(doc->sci, SCI_GETSTYLEBITS, 0, 0)); + gint style_max = pow(2, p_sci->send_message(doc->editor->sci, SCI_GETSTYLEBITS, 0, 0)); /* first read all styles from Scintilla */ for (i = 0; i < style_max; i++) { - styles[i][FORE] = p_sci->send_message(doc->sci, SCI_STYLEGETFORE, i, 0); - styles[i][BACK] = p_sci->send_message(doc->sci, SCI_STYLEGETBACK, i, 0); - styles[i][BOLD] = p_sci->send_message(doc->sci, SCI_STYLEGETBOLD, i, 0); - styles[i][ITALIC] = p_sci->send_message(doc->sci, SCI_STYLEGETITALIC, i, 0); + styles[i][FORE] = p_sci->send_message(doc->editor->sci, SCI_STYLEGETFORE, i, 0); + styles[i][BACK] = p_sci->send_message(doc->editor->sci, SCI_STYLEGETBACK, i, 0); + styles[i][BOLD] = p_sci->send_message(doc->editor->sci, SCI_STYLEGETBOLD, i, 0); + styles[i][ITALIC] = p_sci->send_message(doc->editor->sci, SCI_STYLEGETITALIC, i, 0); styles[i][USED] = 0; } /* read the document and write the LaTeX code */ body = g_string_new(""); - for (i = 0; i < p_sci->get_length(doc->sci); i++) + for (i = 0; i < p_sci->get_length(doc->editor->sci); i++) { - style = p_sci->get_style_at(doc->sci, i); - c = p_sci->get_char_at(doc->sci, i); - c_next = p_sci->get_char_at(doc->sci, i + 1); + style = p_sci->get_style_at(doc->editor->sci, i); + c = p_sci->get_char_at(doc->editor->sci, i); + c_next = p_sci->get_char_at(doc->editor->sci, i + 1); if (style != old_style || ! block_open) { @@ -564,15 +564,15 @@ GString *body; GString *css; GString *html; - gint style_max = pow(2, p_sci->send_message(doc->sci, SCI_GETSTYLEBITS, 0, 0)); + gint style_max = pow(2, p_sci->send_message(doc->editor->sci, SCI_GETSTYLEBITS, 0, 0)); /* first read all styles from Scintilla */ for (i = 0; i < style_max; i++) { - styles[i][FORE] = ROTATE_RGB(p_sci->send_message(doc->sci, SCI_STYLEGETFORE, i, 0)); - styles[i][BACK] = ROTATE_RGB(p_sci->send_message(doc->sci, SCI_STYLEGETBACK, i, 0)); - styles[i][BOLD] = p_sci->send_message(doc->sci, SCI_STYLEGETBOLD, i, 0); - styles[i][ITALIC] = p_sci->send_message(doc->sci, SCI_STYLEGETITALIC, i, 0); + styles[i][FORE] = ROTATE_RGB(p_sci->send_message(doc->editor->sci, SCI_STYLEGETFORE, i, 0)); + styles[i][BACK] = ROTATE_RGB(p_sci->send_message(doc->editor->sci, SCI_STYLEGETBACK, i, 0)); + styles[i][BOLD] = p_sci->send_message(doc->editor->sci, SCI_STYLEGETBOLD, i, 0); + styles[i][ITALIC] = p_sci->send_message(doc->editor->sci, SCI_STYLEGETITALIC, i, 0); styles[i][USED] = 0; } @@ -581,18 +581,18 @@ font_name = pango_font_description_get_family(font_desc); /*font_size = pango_font_description_get_size(font_desc) / PANGO_SCALE;*/ /* take the zoom level also into account */ - font_size = p_sci->send_message(doc->sci, SCI_STYLEGETSIZE, 0, 0); + font_size = p_sci->send_message(doc->editor->sci, SCI_STYLEGETSIZE, 0, 0); if (use_zoom) - font_size += p_sci->send_message(doc->sci, SCI_GETZOOM, 0, 0); + font_size += p_sci->send_message(doc->editor->sci, SCI_GETZOOM, 0, 0); /* read the document and write the HTML body */ body = g_string_new(""); - for (i = 0; i < p_sci->get_length(doc->sci); i++) + for (i = 0; i < p_sci->get_length(doc->editor->sci); i++) { - style = p_sci->get_style_at(doc->sci, i); - c = p_sci->get_char_at(doc->sci, i); + style = p_sci->get_style_at(doc->editor->sci, i); + c = p_sci->get_char_at(doc->editor->sci, i); /* p_sci->get_char_at() takes care of index boundaries and return 0 if i is too high */ - c_next = p_sci->get_char_at(doc->sci, i + 1); + c_next = p_sci->get_char_at(doc->editor->sci, i + 1); if ((style != old_style || ! span_open) && ! isspace(c)) { Modified: trunk/plugins/htmlchars.c =================================================================== --- trunk/plugins/htmlchars.c 2008-07-14 23:43:21 UTC (rev 2778) +++ trunk/plugins/htmlchars.c 2008-07-15 14:29:41 UTC (rev 2779) @@ -28,6 +28,7 @@ #include "support.h" #include "plugindata.h" #include "document.h" +#include "editor.h" #include "keybindings.h" #include "ui_utils.h" #include "utils.h" @@ -445,12 +446,12 @@ if (doc != NULL) { gchar *str; - gint pos = p_sci->get_current_position(doc->sci); + gint pos = p_sci->get_current_position(doc->editor->sci); gtk_tree_model_get(model, iter, COLUMN_HTML_NAME, &str, -1); if (NZV(str)) { - p_sci->insert_text(doc->sci, pos, str); + p_sci->insert_text(doc->editor->sci, pos, str); g_free(str); result = TRUE; } Modified: trunk/plugins/vcdiff.c =================================================================== --- trunk/plugins/vcdiff.c 2008-07-14 23:43:21 UTC (rev 2778) +++ trunk/plugins/vcdiff.c 2008-07-15 14:29:41 UTC (rev 2779) @@ -33,6 +33,7 @@ #include "support.h" #include "plugindata.h" #include "document.h" +#include "editor.h" #include "filetypes.h" #include "utils.h" #include "project.h" @@ -284,9 +285,9 @@ } else { - p_sci->set_text(doc->sci, text); + p_sci->set_text(doc->editor->sci, text); book = GTK_NOTEBOOK(geany->main_widgets->notebook); - page = gtk_notebook_page_num(book, GTK_WIDGET(doc->sci)); + page = gtk_notebook_page_num(book, GTK_WIDGET(doc->editor->sci)); gtk_notebook_set_current_page(book, page); p_document->set_text_changed(doc, FALSE); } Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2008-07-14 23:43:21 UTC (rev 2778) +++ trunk/src/build.c 2008-07-15 14:29:41 UTC (rev 2779) @@ -380,7 +380,8 @@ { case GBO_COMPILE: case GBO_MAKE_OBJECT: - editor_clear_indicators(doc); + g_return_if_fail(doc); + editor_clear_indicators(doc->editor); break; case GBO_BUILD: @@ -392,7 +393,7 @@ for (i = 0; i < documents_array->len; i++) { if (documents[i]->is_valid) - editor_clear_indicators(documents[i]); + editor_clear_indicators(documents[i]->editor); } break; } @@ -858,7 +859,8 @@ { GeanyDocument *doc = document_find_by_filename(filename); - editor_set_indicator_on_line(doc, line - 1); /* will check valid idx */ + if (doc) + editor_set_indicator_on_line(doc->editor, line - 1); color = COLOR_RED; /* error message parsed on the line */ } g_free(filename); Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2008-07-14 23:43:21 UTC (rev 2778) +++ trunk/src/callbacks.c 2008-07-15 14:29:41 UTC (rev 2779) @@ -112,7 +112,7 @@ { if (insert_callback_from_menu) { - editor_info.click_pos = sci_get_current_position(doc->sci); + editor_info.click_pos = sci_get_current_position(doc->editor->sci); insert_callback_from_menu = FALSE; } } @@ -305,7 +305,7 @@ gtk_editable_cut_clipboard(GTK_EDITABLE(focusw)); else if (IS_SCINTILLA(focusw) && doc != NULL) - sci_cut(doc->sci); + sci_cut(doc->editor->sci); else if (GTK_IS_TEXT_VIEW(focusw)) { @@ -327,7 +327,7 @@ gtk_editable_copy_clipboard(GTK_EDITABLE(focusw)); else if (IS_SCINTILLA(focusw) && doc != NULL) - sci_copy(doc->sci); + sci_copy(doc->editor->sci); else if (GTK_IS_TEXT_VIEW(focusw)) { @@ -360,12 +360,12 @@ gchar *content = gtk_clipboard_wait_for_text(gtk_clipboard_get(GDK_NONE)); if (content != NULL) { - sci_replace_sel(doc->sci, content); + sci_replace_sel(doc->editor->sci, content); g_free(content); } } #else - sci_paste(doc->sci); + sci_paste(doc->editor->sci); #endif } else @@ -390,7 +390,7 @@ gtk_editable_delete_selection(GTK_EDITABLE(focusw)); else if (IS_SCINTILLA(focusw) && doc != NULL) - sci_clear(doc->sci); + sci_clear(doc->editor->sci); else if (GTK_IS_TEXT_VIEW(focusw)) { @@ -658,9 +658,9 @@ if (doc != NULL) { if (done++ % 3 == 0) - sci_set_line_numbers(doc->sci, editor_prefs.show_linenumber_margin, - (sci_get_zoom(doc->sci) / 2)); - sci_zoom_in(doc->sci); + sci_set_line_numbers(doc->editor->sci, editor_prefs.show_linenumber_margin, + (sci_get_zoom(doc->editor->sci) / 2)); + sci_zoom_in(doc->editor->sci); } } @@ -672,9 +672,9 @@ GeanyDocument *doc = document_get_current(); if (doc != NULL) { - if (sci_get_zoom(doc->sci) == 0) - sci_set_line_numbers(doc->sci, editor_prefs.show_linenumber_margin, 0); - sci_zoom_out(doc->sci); + if (sci_get_zoom(doc->editor->sci) == 0) + sci_set_line_numbers(doc->editor->sci, editor_prefs.show_linenumber_margin, 0); + sci_zoom_out(doc->editor->sci); } } @@ -686,8 +686,8 @@ GeanyDocument *doc = document_get_current(); if (doc != NULL) { - sci_zoom_off(doc->sci); - sci_set_line_numbers(doc->sci, editor_prefs.show_linenumber_margin, 0); + sci_zoom_off(doc->editor->sci); + sci_set_line_numbers(doc->editor->sci, editor_prefs.show_linenumber_margin, 0); } } @@ -779,8 +779,8 @@ { GeanyDocument *doc = document_get_current(); if (ignore_callback || doc == NULL) return; - sci_convert_eols(doc->sci, SC_EOL_CRLF); - sci_set_eol_mode(doc->sci, SC_EOL_CRLF); + sci_convert_eols(doc->editor->sci, SC_EOL_CRLF); + sci_set_eol_mode(doc->editor->sci, SC_EOL_CRLF); } @@ -790,8 +790,8 @@ { GeanyDocument *doc = document_get_current(); if (ignore_callback || doc == NULL) return; - sci_convert_eols(doc->sci, SC_EOL_LF); - sci_set_eol_mode(doc->sci, SC_EOL_LF); + sci_convert_eols(doc->editor->sci, SC_EOL_LF); + sci_set_eol_mode(doc->editor->sci, SC_EOL_LF); } @@ -801,8 +801,8 @@ { GeanyDocument *doc = document_get_current(); if (ignore_callback || doc == NULL) return; - sci_convert_eols(doc->sci, SC_EOL_CR); - sci_set_eol_mode(doc->sci, SC_EOL_CR); + sci_convert_eols(doc->editor->sci, SC_EOL_CR); + sci_set_eol_mode(doc->editor->sci, SC_EOL_CR); } @@ -863,7 +863,7 @@ if (doc == NULL) return; - sci = doc->sci; + sci = doc->editor->sci; if (! sci_can_copy(sci)) { keybindings_send_command(GEANY_KEY_GROUP_SELECT, GEANY_KEYS_SELECT_WORD); @@ -969,7 +969,7 @@ { GeanyDocument *doc = document_get_current(); if (doc != NULL) - editor_set_line_wrapping(doc, ! doc->line_wrapping); + editor_set_line_wrapping(doc->editor, ! doc->editor->line_wrapping); } } @@ -984,7 +984,7 @@ if (doc == NULL) return; doc->readonly = ! doc->readonly; - sci_set_readonly(doc->sci, doc->readonly); + sci_set_readonly(doc->editor->sci, doc->readonly); ui_update_tab_status(doc); ui_update_statusbar(doc, -1); } @@ -999,7 +999,7 @@ { GeanyDocument *doc = document_get_current(); if (doc != NULL) - doc->auto_indent = ! doc->auto_indent; + doc->editor->auto_indent = ! doc->editor->auto_indent; } } @@ -1015,10 +1015,10 @@ if (doc == NULL) return; - if (sci_can_copy(doc->sci)) + if (sci_can_copy(doc->editor->sci)) { /* take selected text if there is a selection */ - search_text = g_malloc(sci_get_selected_text_length(doc->sci) + 1); - sci_get_selected_text(doc->sci, search_text); + search_text = g_malloc(sci_get_selected_text_length(doc->editor->sci) + 1); + sci_get_selected_text(doc->editor->sci, search_text); flags = SCFIND_MATCHCASE; } else @@ -1042,7 +1042,7 @@ g_return_if_fail(doc != NULL); - sci_set_current_position(doc->sci, editor_info.click_pos, FALSE); + sci_set_current_position(doc->editor->sci, editor_info.click_pos, FALSE); symbols_goto_tag(editor_info.current_word, definition); } @@ -1066,8 +1066,8 @@ if (doc == NULL) return; - pos = sci_get_current_position(doc->sci); - editor_find_current_word(doc->sci, pos, colour, sizeof colour, GEANY_WORDCHARS"#"); + pos = sci_get_current_position(doc->editor->sci); + editor_find_current_word(doc->editor->sci, pos, colour, sizeof colour, GEANY_WORDCHARS"#"); tools_color_chooser(colour); } @@ -1101,7 +1101,7 @@ change_direction ? forward : !forward, FALSE, NULL); if (result > -1) - editor_display_current_line(doc, 0.3F); + editor_display_current_line(doc->editor, 0.3F); set_search_bar_background((result > -1) ? TRUE : FALSE); } @@ -1186,13 +1186,13 @@ GeanyDocument *doc = document_get_current(); gint line = strtol(gtk_entry_get_text(GTK_ENTRY(user_data)), NULL, 10); - if (doc != NULL && line > 0 && line <= sci_get_line_count(doc->sci)) + if (doc != NULL && line > 0 && line <= sci_get_line_count(doc->editor->sci)) { gint pos; line--; /* the user counts lines from 1, we begin at 0 so bring the user line to our one */ - pos = sci_get_position_from_line(doc->sci, line); - editor_goto_pos(doc, pos, TRUE); + pos = sci_get_position_from_line(doc->editor->sci, line); + editor_goto_pos(doc->editor, pos, TRUE); } else { @@ -1288,14 +1288,14 @@ return; } - /* utils_get_current_function returns -1 on failure, so sci_get_position_from_line + /* symbols_get_current_function returns -1 on failure, so sci_get_position_from_line * returns the current position, so it should be safe */ - line = utils_get_current_function(doc, &cur_tag); - pos = sci_get_position_from_line(doc->sci, line - 1); + line = symbols_get_current_function(doc, &cur_tag); + pos = sci_get_position_from_line(doc->editor->sci, line - 1); text = templates_get_template_function(doc->file_type->id, cur_tag); - sci_insert_text(doc->sci, pos, text); + sci_insert_text(doc->editor->sci, pos, text); g_free(text); } @@ -1333,7 +1333,7 @@ verify_click_pos(doc); /* make sure that the click_pos is valid */ - sci_insert_text(doc->sci, editor_info.click_pos, text); + sci_insert_text(doc->editor->sci, editor_info.click_pos, text); g_free(text); } @@ -1353,7 +1353,7 @@ verify_click_pos(doc); /* make sure that the click_pos is valid */ - sci_insert_text(doc->sci, editor_info.click_pos, text); + sci_insert_text(doc->editor->sci, editor_info.click_pos, text); g_free(text); } @@ -1370,10 +1370,10 @@ return; text = templates_get_template_changelog(); - sci_insert_text(doc->sci, 0, text); + sci_insert_text(doc->editor->sci, 0, text); /* sets the cursor to the right position to type the changelog text, * the template has 21 chars + length of name and email */ - sci_goto_pos(doc->sci, 21 + strlen(template_prefs.developer) + strlen(template_prefs.mail), TRUE); + sci_goto_pos(doc->editor->sci, 21 + strlen(template_prefs.developer) + strlen(template_prefs.mail), TRUE); g_free(text); } @@ -1394,8 +1394,8 @@ fname = doc->file_name; text = templates_get_template_fileheader(FILETYPE_ID(ft), fname); - sci_insert_text(doc->sci, 0, text); - sci_goto_pos(doc->sci, 0, FALSE); + sci_insert_text(doc->editor->sci, 0, text); + sci_goto_pos(doc->editor->sci, 0, FALSE); g_free(text); } @@ -1456,8 +1456,8 @@ { verify_click_pos(doc); /* make sure that the click_pos is valid */ - sci_insert_text(doc->sci, editor_info.click_pos, time_str); - sci_goto_pos(doc->sci, editor_info.click_pos + strlen(time_str), FALSE); + sci_insert_text(doc->editor->sci, editor_info.click_pos, time_str); + sci_goto_pos(doc->editor->sci, editor_info.click_pos + strlen(time_str), FALSE); } else { @@ -1490,10 +1490,10 @@ text = g_strconcat("#include <", user_data, ">\n", NULL); } - sci_insert_text(doc->sci, editor_info.click_pos, text); + sci_insert_text(doc->editor->sci, editor_info.click_pos, text); g_free(text); if (pos >= 0) - sci_goto_pos(doc->sci, pos, FALSE); + sci_goto_pos(doc->editor->sci, pos, FALSE); } @@ -1548,7 +1548,7 @@ GeanyDocument *doc = document_get_current(); if (doc != NULL) - editor_clear_indicators(doc); + editor_clear_indicators(doc->editor); } @@ -1591,7 +1591,7 @@ GeanyDocument *doc = document_get_current(); if (doc != NULL) - sci_select_all(doc->sci); + sci_select_all(doc->editor->sci); } @@ -1695,24 +1695,24 @@ if (doc == NULL) return; - if (sci_get_lines_selected(doc->sci) > 1) + if (sci_get_lines_selected(doc->editor->sci) > 1) { - sci_cmd(doc->sci, SCI_TAB); + sci_cmd(doc->editor->sci, SCI_TAB); } else { gint line, ind_pos, old_pos, new_pos, step; - old_pos = sci_get_current_position(doc->sci); - line = sci_get_line_from_position(doc->sci, old_pos); - ind_pos = sci_get_line_indent_position(doc->sci, line); + old_pos = sci_get_current_position(doc->editor->sci); + line = sci_get_line_from_position(doc->editor->sci, old_pos); + ind_pos = sci_get_line_indent_position(doc->editor->sci, line); /* when using tabs increase cur pos by 1, when using space increase it by tab_width */ - step = (doc->use_tabs) ? 1 : editor_prefs.tab_width; + step = (doc->editor->use_tabs) ? 1 : editor_prefs.tab_width; new_pos = (old_pos > ind_pos) ? old_pos + step : old_pos; - sci_set_current_position(doc->sci, ind_pos, TRUE); - sci_cmd(doc->sci, SCI_TAB); - sci_set_current_position(doc->sci, new_pos, TRUE); + sci_set_current_position(doc->editor->sci, ind_pos, TRUE); + sci_cmd(doc->editor->sci, SCI_TAB); + sci_set_current_position(doc->editor->sci, new_pos, TRUE); } } @@ -1725,31 +1725,31 @@ if (doc == NULL) return; - if (sci_get_lines_selected(doc->sci) > 1) + if (sci_get_lines_selected(doc->editor->sci) > 1) { - sci_cmd(doc->sci, SCI_BACKTAB); + sci_cmd(doc->editor->sci, SCI_BACKTAB); } else { gint line, ind_pos, old_pos, new_pos, step, indent; - old_pos = sci_get_current_position(doc->sci); - line = sci_get_line_from_position(doc->sci, old_pos); - ind_pos = sci_get_line_indent_position(doc->sci, line); - step = (doc->use_tabs) ? 1 : editor_prefs.tab_width; + old_pos = sci_get_current_position(doc->editor->sci); + line = sci_get_line_from_position(doc->editor->sci, old_pos); + ind_pos = sci_get_line_indent_position(doc->editor->sci, line); + step = (doc->editor->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->sci, line)) + if (ind_pos == sci_get_position_from_line(doc->editor->sci, line)) return; - sci_set_current_position(doc->sci, ind_pos, TRUE); - indent = sci_get_line_indentation(doc->sci, line); + sci_set_current_position(doc->editor->sci, ind_pos, TRUE); + indent = sci_get_line_indentation(doc->editor->sci, line); indent -= editor_prefs.tab_width; if (indent < 0) indent = 0; - sci_set_line_indentation(doc->sci, line, indent); + sci_set_line_indentation(doc->editor->sci, line, indent); - sci_set_current_position(doc->sci, new_pos, TRUE); + sci_set_current_position(doc->editor->sci, new_pos, TRUE); } } @@ -1923,8 +1923,8 @@ if (doc == NULL) return; - sci_marker_delete_all(doc->sci, 0); /* delete the yellow tag marker */ - sci_marker_delete_all(doc->sci, 1); /* delete user markers */ + sci_marker_delete_all(doc->editor->sci, 0); /* delete the yellow tag marker */ + sci_marker_delete_all(doc->editor->sci, 1); /* delete user markers */ } @@ -1947,10 +1947,10 @@ if (doc == NULL) return; - if (sci_can_copy(doc->sci)) + if (sci_can_copy(doc->editor->sci)) { /* take selected text if there is a selection */ - word = g_malloc(sci_get_selected_text_length(doc->sci) + 1); - sci_get_selected_text(doc->sci, word); + word = g_malloc(sci_get_selected_text_length(doc->editor->sci) + 1); + sci_get_selected_text(doc->editor->sci, word); } else { @@ -2074,7 +2074,7 @@ if (doc == NULL || ignore_callback) return; - editor_set_use_tabs(doc, TRUE); + editor_set_use_tabs(doc->editor, TRUE); ui_update_statusbar(doc, -1); } @@ -2088,7 +2088,7 @@ if (doc == NULL || ignore_callback) return; - editor_set_use_tabs(doc, FALSE); + editor_set_use_tabs(doc->editor, FALSE); ui_update_statusbar(doc, -1); } @@ -2153,7 +2153,7 @@ doc = document_get_current(); g_return_if_fail(doc != NULL); - doc->line_breaking = !doc->line_breaking; + doc->editor->line_breaking = !doc->editor->line_breaking; } void Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2008-07-14 23:43:21 UTC (rev 2778) +++ trunk/src/document.c 2008-07-15 14:29:41 UTC (rev 2779) @@ -192,7 +192,7 @@ for (i = 0; i < documents_array->len; i++) { - if (documents[i]->is_valid && documents[i]->sci == sci) + if (documents[i]->is_valid && documents[i]->editor->sci == sci) return documents[i]; } return NULL; @@ -206,7 +206,7 @@ return -1; return gtk_notebook_page_num(GTK_NOTEBOOK(main_widgets.notebook), - GTK_WIDGET(doc->sci)); + GTK_WIDGET(doc->editor->sci)); } @@ -296,7 +296,7 @@ g_return_if_fail(doc != NULL); - sci = doc->sci; + sci = doc->editor->sci; sci_set_mark_long_lines(sci, editor_prefs.long_line_type, editor_prefs.long_line_column, editor_prefs.long_line_color); @@ -311,7 +311,7 @@ sci_set_folding_margin_visible(sci, editor_prefs.folding); - doc->auto_indent = (editor_prefs.indent_mode != INDENT_NONE); + doc->editor->auto_indent = (editor_prefs.indent_mode != INDENT_NONE); sci_assign_cmdkey(sci, SCK_HOME, editor_prefs.smart_home_key ? SCI_VCHOMEWRAP : SCI_HOMEWRAP); @@ -329,17 +329,13 @@ new_doc->is_valid = FALSE; new_doc->has_tags = FALSE; - new_doc->auto_indent = (editor_prefs.indent_mode != INDENT_NONE); - new_doc->line_wrapping = editor_prefs.line_wrapping; new_doc->readonly = FALSE; new_doc->file_name = NULL; new_doc->file_type = NULL; new_doc->tm_file = NULL; new_doc->encoding = NULL; new_doc->has_bom = FALSE; - new_doc->sci = NULL; - new_doc->scroll_percent = -1.0F; - new_doc->line_breaking = FALSE; + new_doc->editor = NULL; new_doc->mtime = 0; new_doc->changed = FALSE; new_doc->last_check = time(NULL); @@ -362,7 +358,7 @@ for (i = 0; i < documents_array->len; i++) { - if (documents[i]->sci == NULL) + if (documents[i]->editor == NULL) { return (gint) i; } @@ -380,7 +376,7 @@ * document), we need to force a redraw, so the expose event is triggered. * This ensures we don't start colourising before all documents are opened/saved, * only once the editor is drawn. */ - gtk_widget_queue_draw(GTK_WIDGET(doc->sci)); + gtk_widget_queue_draw(GTK_WIDGET(doc->editor->sci)); } @@ -388,8 +384,6 @@ * @return The index of the created document */ static GeanyDocument *document_create(const gchar *utf8_filename) { - PangoFontDescription *pfd; - gchar *fname; GeanyDocument *this; gint new_idx; gint cur_pages = gtk_notebook_get_n_pages(GTK_NOTEBOOK(main_widgets.notebook)); @@ -416,16 +410,10 @@ this->file_name = g_strdup(utf8_filename); - this->sci = editor_create_new_sci(this); + this->editor = editor_create(this); document_apply_update_prefs(this); - pfd = pango_font_description_from_string(interface_prefs.editor_font); - fname = g_strdup_printf("!%s", pango_font_description_get_family(pfd)); - editor_set_font(this, fname, pango_font_description_get_size(pfd) / PANGO_SCALE); - pango_font_description_free(pfd); - g_free(fname); - treeviews_openfiles_add(this); /* sets this->iter */ notebook_new_tab(this); @@ -494,15 +482,16 @@ g_free(doc->real_path); tm_workspace_remove_object(doc->tm_file, TRUE, TRUE); + g_free(doc->editor); + doc->editor = NULL; + doc->is_valid = FALSE; - doc->sci = NULL; doc->file_name = NULL; doc->real_path = NULL; doc->file_type = NULL; doc->encoding = NULL; doc->has_bom = FALSE; doc->tm_file = NULL; - doc->scroll_percent = -1.0F; document_undo_clear(doc); if (gtk_notebook_get_n_pages(GTK_NOTEBOOK(main_widgets.notebook)) == 0) { @@ -557,21 +546,21 @@ g_assert(doc != NULL); - sci_set_undo_collection(doc->sci, FALSE); /* avoid creation of an undo action */ + sci_set_undo_collection(doc->editor->sci, FALSE); /* avoid creation of an undo action */ if (text) - sci_set_text(doc->sci, text); + sci_set_text(doc->editor->sci, text); else - sci_clear_all(doc->sci); + sci_clear_all(doc->editor->sci); - sci_set_eol_mode(doc->sci, file_prefs.default_eol_character); + sci_set_eol_mode(doc->editor->sci, file_prefs.default_eol_character); /* convert the eol chars in the template text in case they are different from * from file_prefs.default_eol */ if (text != NULL) - sci_convert_eols(doc->sci, file_prefs.default_eol_character); + sci_convert_eols(doc->editor->sci, file_prefs.default_eol_character); - editor_set_use_tabs(doc, editor_prefs.use_tabs); - sci_set_undo_collection(doc->sci, TRUE); - sci_empty_undo_buffer(doc->sci); + editor_set_use_tabs(doc->editor, editor_prefs.use_tabs); + sci_set_undo_collection(doc->editor->sci, TRUE); + sci_empty_undo_buffer(doc->editor->sci); doc->mtime = time(NULL); @@ -585,18 +574,18 @@ document_set_filetype(doc, ft); /* also clears taglist */ if (ft == NULL) - highlighting_set_styles(doc->sci, GEANY_FILETYPES_NONE); + highlighting_set_styles(doc->editor->sci, GEANY_FILETYPES_NONE); ui_set_window_title(doc); build_menu_update(doc); document_update_tag_list(doc, FALSE); document_set_text_changed(doc, FALSE); ui_document_show_hide(doc); /* update the document menu */ - sci_set_line_numbers(doc->sci, editor_prefs.show_linenumber_margin, 0); - sci_goto_pos(doc->sci, 0, TRUE); + sci_set_line_numbers(doc->editor->sci, editor_prefs.show_linenumber_margin, 0); + sci_goto_pos(doc->editor->sci, 0, TRUE); /* "the" SCI signal (connect after initial setup(i.e. adding text)) */ - g_signal_connect((GtkWidget*) doc->sci, "sci-notify", G_CALLBACK(on_editor_notification), doc); + g_signal_connect((GtkWidget*) doc->editor->sci, "sci-notify", G_CALLBACK(on_editor_notification), doc); if (geany_object) { @@ -857,25 +846,25 @@ /* Sets the cursor position on opening a file. First it sets the line when cl_options.goto_line * is set, otherwise it sets the line when pos is greater than zero and finally it sets the column * if cl_options.goto_column is set. */ -static void set_cursor_position(GeanyDocument *doc, gint pos) +static void set_cursor_position(GeanyEditor *editor, gint pos) { if (cl_options.goto_line >= 0) { /* goto line which was specified on command line and then undefine the line */ - sci_goto_line(doc->sci, cl_options.goto_line - 1, TRUE); - doc->scroll_percent = 0.5F; + sci_goto_line(editor->sci, cl_options.goto_line - 1, TRUE); + editor->scroll_percent = 0.5F; cl_options.goto_line = -1; } else if (pos > 0) { - sci_set_current_position(doc->sci, pos, FALSE); - doc->scroll_percent = 0.5F; + sci_set_current_position(editor->sci, pos, FALSE); + editor->scroll_percent = 0.5F; } if (cl_options.goto_column >= 0) { /* goto column which was specified on command line and then undefine the column */ - gint cur_pos = sci_get_current_position(doc->sci); - sci_set_current_position(doc->sci, cur_pos + cl_options.goto_column, FALSE); - doc->scroll_percent = 0.5F; + gint cur_pos = sci_get_current_position(editor->sci); + sci_set_current_position(editor->sci, cur_pos + cl_options.goto_column, FALSE); + editor->scroll_percent = 0.5F; cl_options.goto_column = -1; } } @@ -917,20 +906,20 @@ { /* force using tabs for indentation for Makefiles */ if (FILETYPE_ID(doc->file_type) == GEANY_FILETYPES_MAKE) - editor_set_use_tabs(doc, TRUE); + editor_set_use_tabs(doc->editor, TRUE); /* force using spaces for indentation for Fortran 77 */ else if (FILETYPE_ID(doc->file_type) == GEANY_FILETYPES_F77) - editor_set_use_tabs(doc, FALSE); + editor_set_use_tabs(doc->editor, FALSE); else if (! editor_prefs.detect_tab_mode) - editor_set_use_tabs(doc, editor_prefs.use_tabs); + editor_set_use_tabs(doc->editor, editor_prefs.use_tabs); else { /* detect & set tabs/spaces */ - gboolean use_tabs = detect_use_tabs(doc->sci); + gboolean use_tabs = detect_use_tabs(doc->editor->sci); if (use_tabs != editor_prefs.use_tabs) ui_set_statusbar(TRUE, _("Setting %s indentation mode."), (use_tabs) ? _("Tabs") : _("Spaces")); - editor_set_use_tabs(doc, use_tabs); + editor_set_use_tabs(doc->editor, use_tabs); } } @@ -984,11 +973,11 @@ ui_add_recent_file(utf8_filename); /* either add or reorder recent item */ gtk_notebook_set_current_page(GTK_NOTEBOOK(main_widgets.notebook), gtk_notebook_page_num(GTK_NOTEBOOK(main_widgets.notebook), - (GtkWidget*) doc->sci)); + (GtkWidget*) doc->editor->sci)); g_free(utf8_filename); g_free(locale_filename); document_check_disk_status(doc, TRUE); /* force a file changed check */ - set_cursor_position(doc, pos); + set_cursor_position(doc->editor, pos); return doc; } } @@ -1007,20 +996,20 @@ if (! reload) doc = document_create(utf8_filename); g_return_val_if_fail(doc != NULL, NULL); /* really should not happen */ - sci_set_undo_collection(doc->sci, FALSE); /* avoid creation of an undo action */ - sci_empty_undo_buffer(doc->sci); + sci_set_undo_collection(doc->editor->sci, FALSE); /* avoid creation of an undo action */ + sci_empty_undo_buffer(doc->editor->sci); /* add the text to the ScintillaObject */ - sci_set_readonly(doc->sci, FALSE); /* to allow replacing text */ - sci_set_text(doc->sci, filedata.data); /* NULL terminated data */ + sci_set_readonly(doc->editor->sci, FALSE); /* to allow replacing text */ + sci_set_text(doc->editor->sci, filedata.data); /* NULL terminated data */ queue_colourise(doc); /* Ensure the document gets colourised. */ /* detect & set line endings */ editor_mode = utils_get_line_endings(filedata.data, filedata.len); - sci_set_eol_mode(doc->sci, editor_mode); + sci_set_eol_mode(doc->editor->sci, editor_mode); g_free(filedata.data); - sci_set_undo_collection(doc->sci, TRUE); + sci_set_undo_collection(doc->editor->sci, TRUE); doc->mtime = filedata.mtime; /* get the modification time from file and keep it */ g_free(doc->encoding); /* if reloading, free old encoding */ @@ -1029,13 +1018,13 @@ store_saved_encoding(doc); /* store the opened encoding for undo/redo */ doc->readonly = readonly || filedata.readonly; - sci_set_readonly(doc->sci, doc->readonly); + sci_set_readonly(doc->editor->sci, doc->readonly); /* update line number margin width */ - sci_set_line_numbers(doc->sci, editor_prefs.show_linenumber_margin, 0); + sci_set_line_numbers(doc->editor->sci, editor_prefs.show_linenumber_margin, 0); /* set the cursor position according to pos, cl_options.goto_line and cl_options.goto_column */ - set_cursor_position(doc, pos); + set_cursor_position(doc->editor, pos); if (! reload) { @@ -1044,7 +1033,7 @@ doc->real_path = get_real_path_from_utf8(doc->file_name); /* "the" SCI signal (connect after initial setup(i.e. adding text)) */ - g_signal_connect((GtkWidget*) doc->sci, "sci-notify", + g_signal_connect((GtkWidget*) doc->editor->sci, "sci-notify", G_CALLBACK(on_editor_notification), doc); use_ft = (ft != NULL) ? ft : filetypes_detect_from_file(doc); @@ -1060,7 +1049,7 @@ /* set indentation settings after setting the filetype */ if (reload) - editor_set_use_tabs(doc, doc->use_tabs); /* resetup sci */ + editor_set_use_tabs(doc->editor, doc->editor->use_tabs); /* resetup sci */ else set_indentation(doc); @@ -1163,7 +1152,7 @@ return FALSE; /* try to set the cursor to the position before reloading */ - pos = sci_get_current_position(doc->sci); + pos = sci_get_current_position(doc->editor->sci); new_doc = document_open_file_full(doc, NULL, pos, doc->readonly, doc->file_type, forced_enc); return (new_doc != NULL); @@ -1200,8 +1189,8 @@ gint line_start; /* for some reason we can use byte count instead of character count here */ - *line = sci_get_line_from_position(doc->sci, byte_pos); - line_start = sci_get_position_from_line(doc->sci, *line); + *line = sci_get_line_from_position(doc->editor->sci, byte_pos); + line_start = sci_get_position_from_line(doc->editor->sci, *line); /* get the column in the line */ *column = byte_pos - line_start; @@ -1209,7 +1198,7 @@ * skip one byte(i++) and decrease the column number which is based on byte count */ for (i = line_start; i < (line_start + *column); i++) { - if (sci_get_char_at(doc->sci, i) < 0) + if (sci_get_char_at(doc->editor->sci, i) < 0) { (*column)--; i++; @@ -1218,6 +1207,34 @@ } +static void replace_header_filename(GeanyDocument *doc) +{ + gchar *filebase; + gchar *filename; + struct TextToFind ttf; + + if (doc == NULL || doc->file_type == NULL) return; + + filebase = g_strconcat(GEANY_STRING_UNTITLED, ".", (doc->file_type)->extension, NULL); + filename = g_path_get_basename(doc->file_name); + + /* only search the first 3 lines */ + ttf.chrg.cpMin = 0; + ttf.chrg.cpMax = sci_get_position_from_line(doc->editor->sci, 3); + ttf.lpstrText = (gchar*)filebase; + + if (sci_find_text(doc->editor->sci, SCFIND_MATCHCASE, &ttf) != -1) + { + sci_target_start(doc->editor->sci, ttf.chrgText.cpMin); + sci_target_end(doc->editor->sci, ttf.chrgText.cpMax); + sci_target_replace(doc->editor->sci, filename, FALSE); + } + + g_free(filebase); + g_free(filename); +} + + /* * Save the %document, detecting the filetype. * @@ -1252,7 +1269,7 @@ ignore_callback = FALSE; } } - utils_replace_filename(doc); + replace_header_filename(doc); ret = document_save_file(doc, TRUE); if (ret) @@ -1291,7 +1308,7 @@ /* don't read over the doc length */ gint max_len = MIN((gint)bytes_read + 6, (gint)*len - 1); context = g_malloc(7); /* read 6 bytes from Sci + '\0' */ - sci_get_text_range(doc->sci, bytes_read, max_len, context); + sci_get_text_range(doc->editor->sci, bytes_read, max_len, context); /* take only one valid Unicode character from the context and discard the leftover */ unic = g_utf8_get_char_validated(context, -1); @@ -1396,7 +1413,7 @@ if (file_prefs.final_new_line) editor_ensure_final_newline(doc); - len = sci_get_length(doc->sci) + 1; + len = sci_get_length(doc->editor->sci) + 1; if (doc->has_bom && encodings_is_unicode_charset(doc->encoding)) { /* always write a UTF-8 BOM because in this moment the text itself is still in UTF-8 * encoding, it will be converted to doc->encoding below and this conversion @@ -1405,13 +1422,13 @@ data[0] = (gchar) 0xef; data[1] = (gchar) 0xbb; data[2] = (gchar) 0xbf; - sci_get_text(doc->sci, len, data + 3); + sci_get_text(doc->editor->sci, len, data + 3); len += 3; } else { data = (gchar*) g_malloc(len); - sci_get_text(doc->sci, len, data); + sci_get_text(doc->editor->sci, len, data); } /* save in original encoding, skip when it is already UTF-8 or has the encoding "None" */ @@ -1456,8 +1473,8 @@ /* set line numbers again, to reset the margin width, if * there are more lines than before */ - sci_set_line_numbers(doc->sci, editor_prefs.show_linenumber_margin, 0); - sci_set_savepoint(doc->sci); + sci_set_line_numbers(doc->editor->sci, editor_prefs.show_linenumber_margin, 0); + sci_set_savepoint(doc->editor->sci); /* stat the file to get the timestamp, otherwise on Windows the actual * timestamp can be ahead of time(NULL) */ @@ -1501,38 +1518,38 @@ if (! *text) return TRUE; - start_pos = (inc) ? sci_get_selection_start(doc->sci) : - sci_get_selection_end(doc->sci); /* equal if no selection */ + start_pos = (inc) ? sci_get_selection_start(doc->editor->sci) : + sci_get_selection_end(doc->editor->sci); /* equal if no selection */ /* search cursor to end */ ttf.chrg.cpMin = start_pos; - ttf.chrg.cpMax = sci_get_length(doc->sci); + ttf.chrg.cpMax = sci_get_length(doc->editor->sci); ttf.lpstrText = (gchar *)text; - search_pos = sci_find_text(doc->sci, flags, &ttf); + search_pos = sci_find_text(doc->editor->sci, flags, &ttf); /* if no match, search start to cursor */ if (search_pos == -1) { ttf.chrg.cpMin = 0; ttf.chrg.cpMax = start_pos + strlen(text); - search_pos = sci_find_text(doc->sci, flags, &ttf); + search_pos = sci_find_text(doc->editor->sci, flags, &ttf); } if (search_pos != -1) { - gint line = sci_get_line_from_position(doc->sci, ttf.chrgText.cpMin); + gint line = sci_get_line_from_position(doc->editor->sci, ttf.chrgText.cpMin); /* unfold maybe folded results */ - sci_ensure_line_is_visible(doc->sci, line); + sci_ensure_line_is_visible(doc->editor->sci, line); - sci_set_selection_start(doc->sci, ttf.chrgText.cpMin); - sci_set_selection_end(doc->sci, ttf.chrgText.cpMax); + sci_set_selection_start(doc->editor->sci, ttf.chrgText.cpMin); + sci_set_selection_end(doc->editor->sci, ttf.chrgText.cpMax); - if (! editor_line_in_view(doc->sci, line)) + if (! editor_line_in_view(doc->editor->sci, line)) { /* we need to force scrolling in case the cursor is outside of the current visible area * GeanyDocument::scroll_percent doesn't work because sci isn't always updated * while searching */ - editor_scroll_to_line(doc->sci, -1, 0.3F); + editor_scroll_to_line(doc->editor->sci, -1, 0.3F); } return TRUE; } @@ -1543,7 +1560,7 @@ ui_set_statusbar(FALSE, _("\"%s\" was not found."), text); } utils_beep(); - sci_goto_pos(doc->sci, start_pos, FALSE); /* clear selection */ + sci_goto_pos(doc->editor->sci, start_pos, FALSE); /* clear selection */ return FALSE; } } @@ -1563,33 +1580,33 @@ if (flags & SCFIND_REGEXP) search_backwards = FALSE; - selection_start = sci_get_selection_start(doc->sci); - selection_end = sci_get_selection_end(doc->sci); + selection_start = sci_get_selection_start(doc->editor->sci); + selection_end = sci_get_selection_end(doc->editor->sci); if ((selection_end - selection_start) > 0) { /* there's a selection so go to the end */ if (search_backwards) - sci_goto_pos(doc->sci, selection_start, TRUE); + sci_goto_pos(doc->editor->sci, selection_start, TRUE); else - sci_goto_pos(doc->sci, selection_end, TRUE); + sci_goto_pos(doc->editor->sci, selection_end, TRUE); } - sci_set_search_anchor(doc->sci); + sci_set_search_anchor(doc->editor->sci); if (search_backwards) - search_pos = sci_search_prev(doc->sci, flags, text); + search_pos = sci_search_prev(doc->editor->sci, flags, text); else - search_pos = sci_search_next(doc->sci, flags, text); + search_pos = sci_search_next(doc->editor->sci, flags, text); if (search_pos != -1) { /* unfold maybe folded results */ - sci_ensure_line_is_visible(doc->sci, - sci_get_line_from_position(doc->sci, search_pos)); + sci_ensure_line_is_visible(doc->editor->sci, + sci_get_line_from_position(doc->editor->sci, search_pos)); if (scroll) - doc->scroll_percent = 0.3F; + doc->editor->scroll_percent = 0.3F; } else { - gint sci_len = sci_get_length(doc->sci); + gint sci_len = sci_get_length(doc->editor->sci); /* if we just searched the whole text, give up searching. */ if ((selection_end == 0 && ! search_backwards) || @@ -1607,11 +1624,11 @@ { gint ret; - sci_set_current_position(doc->sci, (search_backwards) ? sci_len : 0, FALSE); + sci_set_current_position(doc->editor->sci, (search_backwards) ? sci_len : 0, FALSE); ret = document_find_text(doc, text, flags, search_backwards, scroll, parent); if (ret == -1) { /* return to original cursor position if not found */ - sci_set_current_position(doc->sci, selection_start, FALSE); + sci_set_current_position(doc->editor->sci, selection_start, FALSE); } return ret; } @@ -1634,8 +1651,8 @@ if (flags & SCFIND_REGEXP) search_backwards = FALSE; - selection_start = sci_get_selection_start(doc->sci); - selection_end = sci_get_selection_end(doc->sci); + selection_start = sci_get_selection_start(doc->editor->sci); + selection_end = sci_get_selection_end(doc->editor->sci); if (selection_end == selection_start) { /* no selection so just find the next match */ @@ -1645,9 +1662,9 @@ /* there's a selection so go to the start before finding to search through it * this ensures there is a match */ if (search_backwards) - sci_goto_pos(doc->sci, selection_end, TRUE); + sci_goto_pos(doc->editor->sci, selection_end, TRUE); else - sci_goto_pos(doc->sci, selection_start, TRUE); + sci_goto_pos(doc->editor->sci, selection_start, TRUE); search_pos = document_find_text(doc, find_text, flags, search_backwards, TRUE, NULL); /* return if the original selected text did not match (at the start of the selection) */ @@ -1658,11 +1675,11 @@ { gint replace_len; /* search next/prev will select matching text, which we use to set the replace target */ - sci_target_from_selection(doc->sci); - replace_len = sci_target_replace(doc->sci, replace_text, flags & SCFIND_REGEXP); + sci_target_from_selection(doc->editor->sci); + replace_len = sci_target_replace(doc->editor->sci, replace_text, flags & SCFIND_REGEXP); /* select the replacement - find text will skip past the selected text */ - sci_set_selection_start(doc->sci, search_pos); - sci_set_selection_end(doc->sci, search_pos + replace_len); + sci_set_selection_start(doc->editor->sci, search_pos); + sci_set_selection_end(doc->editor->sci, search_pos + replace_len); } else { @@ -1727,7 +1744,7 @@ g_return_val_if_fail(doc != NULL && find_text != NULL && replace_text != NULL, 0); if (! *find_text || doc->readonly) return 0; - sci = doc->sci; + sci = doc->editor->sci; sci_start_undo_action(sci); ttf.chrg.cpMin = start; @@ -1801,8 +1818,8 @@ g_return_if_fail(doc != NULL && find_text != NULL && replace_text != NULL); if (! *find_text) return; - selection_start = sci_get_selection_start(doc->sci); - selection_end = sci_get_selection_end(doc->sci); + selection_start = sci_get_selection_start(doc->editor->sci); + selection_end = sci_get_selection_end(doc->editor->sci); /* do we have a selection? */ if ((selection_end - selection_start) == 0) { @@ -1810,24 +1827,24 @@ return; } - selection_mode = sci_get_selection_mode(doc->sci); - selected_lines = sci_get_lines_selected(doc->sci); + selection_mode = sci_get_selection_mode(doc->editor->sci); + selected_lines = sci_get_lines_selected(doc->editor->sci); /* handle rectangle, multi line selections (it doesn't matter on a single line) */ if (selection_mode == SC_SEL_RECTANGLE && selected_lines > 1) { gint first_line, line; - sci_start_undo_action(doc->sci); + sci_start_undo_action(doc->editor->sci); - first_line = sci_get_line_from_position(doc->sci, selection_start); + first_line = sci_get_line_from_position(doc->editor->sci, selection_start); /* Find the last line with chars selected (not EOL char) */ - last_line = sci_get_line_from_position(doc->sci, + last_line = sci_get_line_from_position(doc->editor->sci, selection_end - editor_get_eol_char_len(doc)); last_line = MAX(first_line, last_line); for (line = first_line; line < (first_line + selected_lines); line++) { - gint line_start = sci_get_pos_at_line_sel_start(doc->sci, line); - gint line_end = sci_get_pos_at_line_sel_end(doc->sci, line); + gint line_start = sci_get_pos_at_line_sel_start(doc->editor->sci, line); + gint line_end = sci_get_pos_at_line_sel_end(doc->editor->sci, line); /* skip line if there is no selection */ if (line_start != INVALID_POSITION) @@ -1842,11 +1859,11 @@ replaced = TRUE; /* this gets the greatest column within the selection after replacing */ max_column = MAX(max_column, - new_sel_end - sci_get_position_from_line(doc->sci, line)); + new_sel_end - sci_get_position_from_line(doc->editor->sci, line)); } } } - sci_end_undo_action(doc->sci); + sci_end_undo_action(doc->editor->sci); } else /* handle normal line selection */ { @@ -1862,26 +1879,26 @@ if (selection_mode == SC_SEL_RECTANGLE && selected_lines > 1) { /* now we can scroll to the selection and destroy it because we rebuild it later */ - /*sci_goto_pos(doc->sci, selection_start, FALSE);*/ + /*sci_goto_pos(doc->editor->sci, selection_start, FALSE);*/ /* Note: the selection will be wrapped to last_line + 1 if max_column is greater than * the highest column on the last line. The wrapped selection is completely different * from the original one, so skip the selection at all */ /* TODO is there a better way to handle the wrapped selection? */ - if ((sci_get_line_length(doc->sci, last_line) - 1) >= max_column) + if ((sci_get_line_length(doc->editor->sci, last_line) - 1) >= max_column) { /* for keeping and adjusting the selection in multi line rectangle selection we * need the last line of the original selection and the greatest column number after * replacing and set the selection end to the last line at the greatest column */ - sci_set_selection_start(doc->sci, selection_start); - sci_set_selection_end(doc->sci, - sci_get_position_from_line(doc->sci, last_line) + max_column); - sci_set_selection_mode(doc->sci, selection_mode); + sci_set_selection_start(doc->editor->sci, selection_start); + sci_set_selection_end(doc->editor->sci, + sci_get_position_from_line(doc->editor->sci, last_line) + max_column); + sci_set_selection_mode(doc->editor->sci, selection_mode); } } else { - sci_set_selection_start(doc->sci, selection_start); - sci_set_selection_end(doc->sci, selection_end); + sci_set_selection_start(doc->editor->sci, selection_start); + sci_set_selection_end(doc->editor->sci, selection_end); } } else /* no replacements */ @@ -1899,7 +1916,7 @@ g_return_val_if_fail(doc != NULL && find_text != NULL && replace_text != NULL, FALSE); if (! *find_text) return FALSE; - len = sci_get_length(doc->sci); + len = sci_get_length(doc->editor->sci); count = document_replace_range( doc, find_text, replace_text, flags, 0, len, TRUE, NULL); @@ -2002,7 +2019,7 @@ gboolean ret = FALSE; guint n; const GString *s; - ScintillaObject *sci = doc ? doc->sci : NULL; + ScintillaObject *sci = doc ? doc->editor->sci : NULL; if (sci != NULL && editor_lexer_get_type_keyword_idx(sci_get_lexer(sci)) == -1) return FALSE; @@ -2022,10 +2039,9 @@ for (n = 0; n < documents_array->len; n++) { - ScintillaObject *wid = documents[n]->sci; - - if (wid) + if (documents[n]->is_valid) { + ScintillaObject *wid = documents[n]->editor->sci; gint keyword_idx = editor_lexer_get_type_keyword_idx(sci_get_lexer(wid)); if (keyword_idx > 0) @@ -2066,7 +2082,7 @@ tm_workspace_remove_object(doc->tm_file, TRUE, TRUE); doc->tm_file = NULL; } - highlighting_set_styles(doc->sci, type->id); + highlighting_set_styles(doc->editor->sci, type->id); build_menu_update(doc); queue_colourise(doc); } @@ -2142,7 +2158,7 @@ } fdoc->redo_actions = NULL; - if (! main_status.quitting && doc->sci != NULL) + if (! main_status.quitting && doc->editor != NULL) document_set_text_changed(doc, FALSE); /*geany_debug("%s: new undo stack height: %d, new redo stack height: %d", __func__, @@ -2179,7 +2195,7 @@ if (doc == NULL) return FALSE; - if (g_trash_stack_height(&fdoc->undo_actions) > 0 || sci_can_undo(doc->sci)) + if (g_trash_stack_height(&fdoc->undo_actions) > 0 || sci_can_undo(doc->editor->sci)) return TRUE; else return FALSE; @@ -2191,7 +2207,7 @@ Document *fdoc = DOCUMENT(doc); doc->changed = - (sci_is_modified(doc->sci) || + (sci_is_modified(doc->editor->sci) || doc->has_bom != fdoc->saved_encoding.has_bom || ! utils_str_equal(doc->encoding, fdoc->saved_encoding.encoding)); document_set_text_changed(doc, doc->changed); @@ -2212,7 +2228,7 @@ { /* fallback, should not be necessary */ geany_debug("%s: fallback used", __func__); - sci_undo(doc->sci); + sci_undo(doc->editor->sci); } else { @@ -2222,7 +2238,7 @@ { document_redo_add(doc, UNDO_SCINTILLA, NULL); - sci_undo(doc->sci); + sci_undo(doc->editor->sci); break; } case UNDO_BOM: @@ -2266,7 +2282,7 @@ if (doc == NULL) return FALSE; - if (g_trash_stack_height(&fdoc->redo_actions) > 0 || sci_can_redo(doc->sci)) + if (g_trash_stack_height(&fdoc->redo_actions) > 0 || sci_can_redo(doc->editor->sci)) return TRUE; else return FALSE; @@ -2287,7 +2303,7 @@ { /* fallback, should not be necessary */ geany_debug("%s: fallback used", __func__); - sci_redo(doc->sci); + sci_redo(doc->editor->sci); } else { @@ -2297,7 +2313,7 @@ { document_undo_add(doc, UNDO_SCINTILLA, NULL); - sci_redo(doc->sci); + sci_redo(doc->editor->sci); break; } case UNDO_BOM: @@ -2389,20 +2405,20 @@ gchar *text; GeanyDocument *doc; - len = sci_get_length(old_doc->sci) + 1; + len = sci_get_length(old_doc->editor->sci) + 1; text = (gchar*) g_malloc(len); - sci_get_text(old_doc->sci, len, text); + sci_get_text(old_doc->editor->sci, len, text); /* use old file type (or maybe NULL for auto detect would be better?) */ doc = document_new_file(utf8_filename, old_doc->file_type, text); g_free(text); /* copy file properties */ - doc->line_wrapping = old_doc->line_wrapping; + doc->editor->line_wrapping = old_doc->editor->line_wrapping; doc->readonly = old_doc->readonly; doc->has_bom = old_doc->has_bom; document_set_encoding(doc, old_doc->encoding); - sci_set_lines_wrapped(doc->sci, doc->line_wrapping); - sci_set_readonly(doc->sci, doc->readonly); + sci_set_lines_wrapped(doc->editor->sci, doc->editor->line_wrapping); + sci_set_readonly(doc->editor->sci, doc->readonly); ui_document_show_hide(doc); return doc; Modified: trunk/src/document.h =================================================================== --- trunk/src/document.h 2008-07-14 23:43:21 UTC (rev 2778) +++ trunk/src/document.h 2008-07-15 14:29:41 UTC (rev 2779) @@ -82,30 +82,20 @@ gchar *encoding; /** Internally used flag to indicate whether the file of this %document has a byte-order-mark. */ gboolean has_bom; + struct GeanyEditor *editor; /**< The editor associated with the document. */ /** The filetype for this %document, it's only a reference to one of the elements of the global * filetypes array. */ GeanyFiletype *file_type; /** TMWorkObject object for this %document. */ TMWorkObject *tm_file; - /** The Scintilla object for this %document. */ - ScintillaObject *sci; /** Whether this %document is read-only. */ gboolean readonly; /** Whether this %document has been changed since it was last saved. */ gboolean changed; - /** %Document-specific line wrapping setting. */ - gboolean line_wrapping; - /** %Document-specific indentation setting. */ - gboolean auto_indent; - /** Percentage to scroll view by on paint, if positive. */ - gfloat scroll_percent; /** Time of the last disk check. */ time_t last_check; /** Modification time of this %document on disk. */ time_t mtime; - /** %Document-specific indentation setting. */ - gboolean use_tabs; - gboolean line_breaking; /**< Whether to split long lines as you type. */ /** The link-dereferenced, locale-encoded file name. * If non-NULL, this indicates the file once existed on disk (not just as an * unsaved document with a filename set). Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2008-07-14 23:43:21 UTC (rev 2778) +++ trunk/src/editor.c 2008-07-15 14:29:41 UTC (rev 2779) @@ -72,13 +72,13 @@ static gchar indent[100]; -static void on_new_line_added(GeanyDocument *doc); -static gboolean handle_xml(GeanyDocument *doc, gchar ch); -static void get_indent(GeanyDocument *doc, gint pos, gboolean use_this_line); -static void auto_multiline(GeanyDocument *doc, gint pos); +static void on_new_line_added(GeanyEditor *editor); +static gboolean handle_xml(GeanyEditor *editor, gchar ch); +static void get_indent(GeanyEditor *editor, gint pos, gboolean use_this_line); +static void auto_multiline(GeanyEditor *editor, gint pos); static gboolean is_comment(gint lexer, gint prev_style, gint style); static void auto_close_bracket(ScintillaObject *sci, gint pos, gchar c); -static void editor_auto_table(GeanyDocument *doc, gint pos); +static void auto_table(GeanyEditor *editor, gint pos); @@ -181,20 +181,20 @@ if (doc == NULL) return FALSE; - editor_info.click_pos = sci_get_position_from_xy(doc->sci, (gint)event->x, (gint)event->y, FALSE); + editor_info.click_pos = sci_get_position_from_xy(doc->editor->sci, (gint)event->x, (gint)event->y, FALSE); if (event->button == 1) { if (GDK_BUTTON_PRESS == event->type && editor_prefs.disable_dnd) { - gint ss = sci_get_selection_start(doc->sci); - sci_set_selection_end(doc->sci, ss); + gint ss = sci_get_selection_start(doc->editor->sci); + sci_set_selection_end(doc->editor->sci, ss); } return document_check_disk_status(doc, FALSE); } if (event->button == 3) { - editor_find_current_word(doc->sci, editor_info.click_pos, + editor_find_current_word(doc->editor->sci, editor_info.click_pos, current_word, sizeof current_word, NULL); ui_update_popup_goto_items((current_word[0] != '\0') ? TRUE : FALSE); @@ -265,7 +265,7 @@ 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->sci, 1);*/ + /*sci_marker_delete_all(doc->editor->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 */ @@ -276,27 +276,27 @@ } -static void on_update_ui(GeanyDocument *doc, G_GNUC_UNUSED SCNotification *nt) +static void on_update_ui(GeanyEditor *editor, G_GNUC_UNUSED SCNotification *nt) { - ScintillaObject *sci = doc->sci; + ScintillaObject *sci = editor->sci; gint pos = sci_get_current_position(sci); /* undo / redo menu update */ - ui_update_popup_reundo_items(doc); + ui_update_popup_reundo_items(editor->document); /* brace highlighting */ editor_highlight_braces(sci, pos); - ui_update_statusbar(doc, pos); + ui_update_statusbar(editor->document, 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->scroll_percent > 0.0F) + if (editor->scroll_percent > 0.0F) { - editor_scroll_to_line(sci, -1, doc->scroll_percent); - doc->scroll_percent = -1.0F; /* disable further scrolling */ + editor_scroll_to_line(sci, -1, editor->scroll_percent); + editor->scroll_percent = -1.0F; /* disable further scrolling */ } #if 0 /** experimental code for inverting selections */ @@ -315,12 +315,12 @@ } -static void check_line_breaking(GeanyDocument *doc, gint pos, gchar c) +static void check_line_breaking(GeanyEditor *editor, gint pos, gchar c) { - ScintillaObject *sci = doc->sci; + ScintillaObject *sci = editor->sci; gint line, lstart; - if (!doc->line_breaking) + if (!editor->line_breaking) return; if (c == GDK_space) @@ -341,7 +341,7 @@ if (c == GDK_space) { gint col, len, diff; - const gchar *eol = editor_get_eol_char(doc); + const gchar *eol = editor_get_eol_char(editor->document); /* break the line after the space */ sci_insert_text(sci, pos + 1, eol); @@ -358,7 +358,7 @@ pos = sci_get_position_from_line(sci, line); sci_set_current_position(sci, pos, FALSE); /* add indentation, comment multilines, etc */ - on_new_line_added(doc); + on_new_line_added(editor); /* correct cursor position (might not be at line end) */ pos = sci_get_position_from_line(sci, line); @@ -370,9 +370,9 @@ } -static void on_char_added(GeanyDocument *doc, SCNotification *nt) +static void on_char_added(GeanyEditor *editor, SCNotification *nt) { - ScintillaObject *sci = doc->sci; + ScintillaObject *sci = editor->sci; gint pos = sci_get_current_position(sci); switch (nt->ch) @@ -380,23 +380,23 @@ case '\r': { /* simple indentation (only for CR format) */ if (sci_get_eol_mode(sci) == SC_EOL_CR) - on_new_line_added(doc); + on_new_line_added(editor); break; } case '\n': { /* simple indentation (for CR/LF and LF format) */ - on_new_line_added(doc); + on_new_line_added(editor); break; } case '>': case '/': { /* close xml-tags */ - handle_xml(doc, nt->ch); + handle_xml(editor, nt->ch); break; } case '(': { /* show calltips */ - editor_show_calltip(doc, --pos); + editor_show_calltip(editor->document, --pos); break; } case ')': @@ -418,19 +418,20 @@ if (sci_get_lexer(sci) == SCLEX_LATEX) { auto_close_bracket(sci, pos, nt->ch); /* Tex auto-closing */ - editor_show_calltip(doc, --pos); + editor_show_calltip(editor->document, --pos); } break; } case '}': { /* closing bracket handling */ - if (doc->auto_indent) - editor_close_block(doc, pos - 1); + if (editor->auto_indent) + editor_close_block(editor->document, pos - 1); break; } - default: editor_start_auto_complete(doc, pos, FALSE); + default: + editor_start_auto_complete(editor->document, pos, FALSE); } - check_line_breaking(doc, pos, nt->ch); + check_line_breaking(editor, pos, nt->ch); } @@ -567,14 +568,15 @@ /* callback func called by all editors when a signal arises */ -void on_editor_notification(GtkWidget *editor, gint scn, gpointer lscn, gpointer user_data) +void on_editor_notification(GtkWidget *widget, gint scn, gpointer lscn, gpointer user_data) { SCNotification *nt; ScintillaObject *sci; - GeanyDocument *doc; + GeanyDocument *doc = user_data; + GeanyEditor *editor; - doc = user_data; - sci = doc->sci; + editor = doc->editor; + sci = editor->sci; nt = lscn; switch (nt->nmhdr.code) @@ -599,7 +601,7 @@ break; case SCN_UPDATEUI: - on_update_ui(doc, nt); + on_update_ui(editor, nt); break; case SCN_MODIFIED: @@ -617,7 +619,7 @@ break; } case SCN_CHARADDED: - on_char_added(doc, nt); + on_char_added(editor, nt); break; case SCN_USERLISTSELECTION: @@ -722,53 +724,54 @@ } -static void check_python_indent(GeanyDocument *doc, gint pos) +static void check_python_indent(GeanyEditor *editor, gint pos) { - gint last_char = pos - editor_get_eol_char_len(doc) - 1; + ScintillaObject *sci = editor->sci; + gint last_char = pos - editor_get_eol_char_len(editor->document) - 1; /* add extra indentation for Python after colon */ - if (sci_get_char_at(doc->sci, last_char) == ':' && - sci_get_style_at(doc->sci, last_char) == SCE_P_OPERATOR) + if (sci_get_char_at(sci, last_char) == ':' && + sci_get_style_at(sci, last_char) == SCE_P_OPERATOR) { /* creates and inserts one tabulator sign or * whitespace of the amount of the tab width */ - gchar *text = get_whitespace(editor_prefs.tab_width, doc->use_tabs); - sci_add_text(doc->sci, text); + gchar *text = get_whitespace(editor_prefs.tab_width, editor->use_tabs); + sci_add_text(sci, text); g_free(text); } } -static void on_new_line_added(GeanyDocument *doc) +static void on_new_line_added(GeanyEditor *editor) { - ScintillaObject *sci = doc->sci; + ScintillaObject *sci = editor->sci; gint pos = sci_get_current_position(sci); gint line = sci_get_current_line(sci); /* simple indentation */ - if (doc->auto_indent) + if (editor->auto_indent) { - get_indent(doc, pos, FALSE); + get_indent(editor, pos, FALSE); sci_add_text(sci, indent); if (editor_prefs.indent_mode > INDENT_BASIC && - FILETYPE_ID(doc->file_type) == GEANY_FILETYPES_PYTHON) - check_python_indent(doc, pos); + FILETYPE_ID(editor->document->file_type) == GEANY_FILETYPES_PYTHON) + check_python_indent(editor, pos); } if (editor_prefs.auto_continue_multiline) { /* " * " auto completion in multiline C/C++/D/Java comments */ - auto_multiline(doc, pos); + auto_multiline(editor, pos); } if (editor_prefs.complete_snippets) { - editor_auto_latex(doc, pos); + editor_auto_latex(editor->document, pos); } if (editor_prefs.newline_strip) { /* strip the trailing spaces on the previous line */ - editor_strip_line_trailing_spaces(doc, line - 1); + editor_strip_line_trailing_spaces(editor->document, line - 1); } } @@ -815,9 +818,9 @@ /* "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(GeanyDocument *doc, gint pos, gboolean use_this_line) +static void get_indent(GeanyEditor *editor, gint pos, gboolean use_this_line) { - ScintillaObject *sci = doc->sci; + ScintillaObject *sci = editor->sci; guint i, len, j = 0; gint prev_line; gchar *linebuf; @@ -846,7 +849,7 @@ * " { return bless({}, shift); }" (Perl) */ if (linebuf[i] == '{' && i == (len - 1)) { - do_indent(indent, sizeof(indent), &j, doc->use_tabs); + do_indent(indent, sizeof(indent), &j, editor->use_tabs); break; } else @@ -859,7 +862,7 @@ * e.g. for (...) { */ if (linebuf[k] == '{') { - do_indent(indent, sizeof(indent), &j, doc->use_tabs); + do_indent(indent, sizeof(indent), &j, editor->use_tabs); } break; } @@ -940,7 +943,7 @@ if (doc == NULL || doc->file_type == NULL) return; - sci = doc->sci; + sci = doc->editor->sci; if (! lexer_has_braces(sci)) return; @@ -972,7 +975,7 @@ { gint line_start; - get_indent(doc, start_brace, TRUE); + get_indent(doc->editor, start_brace, TRUE); text = g_strconcat(indent, "}", NULL); line_start = sci_get_position_from_line(sci, line); sci_set_anchor(sci, line_start); @@ -1199,7 +1202,7 @@ if (doc == NULL || doc->file_type == NULL) return FALSE; - sci = doc->sci; + sci = doc->editor->sci; lexer = SSM(sci, SCI_GETLEXER, 0, 0); @@ -1283,7 +1286,7 @@ if (doc == NULL || doc->file_type == NULL) return FALSE; - sci = doc->sci; + sci = doc->editor->sci; tags = tm_workspace_find(root, tm_tag_max_t, attrs, TRUE, doc->file_type->lang); if (NULL != tags && tags->len > 0) @@ -1337,7 +1340,7 @@ doc == NULL || doc->file_type == NULL) return FALSE; - sci = doc->sci; + sci = doc->editor->sci; ft = doc->file_type; line = sci_get_line_from_position(sci, pos); @@ -1398,10 +1401,11 @@ if (doc == NULL || doc->file_type == NULL) return; - sci = doc->sci; + sci = doc->editor->sci; if (sci_get_char_at(sci, pos - 2) == '}') { + GeanyEditor *editor = doc->editor; gchar *eol, *buf, *construct; gchar env[50]; gint line = sci_get_line_from_position(sci, pos - 2); @@ -1452,8 +1456,8 @@ } /* get the indentation */ - if (doc->auto_indent) - get_indent(doc, pos, TRUE); + if (editor->auto_indent) + get_indent(editor, pos, TRUE); eol = g_strconcat(editor_get_eol_char(doc), indent, NULL); construct = g_strdup_printf("%s\\end%s{%s}", eol, full_cmd, env); @@ -1539,16 +1543,16 @@ } -static gboolean snippets_complete_constructs(GeanyDocument *doc, gint pos, const gchar *word) +static gboolean snippets_complete_constructs(GeanyEditor *editor, gint pos, const gchar *word) { gchar *str; gchar *pattern; gchar *lindent; gchar *whitespace; gint step, str_len; - gint ft_id = FILETYPE_ID(doc->file_type); + gint ft_id = FILETYPE_ID(editor->document->file_type); GHashTable *specials; - ScintillaObject *sci = doc->sci; + ScintillaObject *sci = editor->sci; str = g_strdup(word); g_strstrip(str); @@ -1560,9 +1564,9 @@ return FALSE; } - get_indent(doc, pos, TRUE); - lindent = g_strconcat(editor_get_eol_char(doc), indent, NULL); - whitespace = get_whitespace(editor_prefs.tab_width, doc->use_tabs); + get_indent(editor, pos, TRUE); + lindent = g_strconcat(editor_get_eol_char(editor->document), indent, NULL); + whitespace = get_whitespace(editor_prefs.tab_width, editor->use_tabs); /* remove the typed word, it will be added again by the used auto completion * (not really necessary but this makes the auto completion more flexible, @@ -1591,7 +1595,7 @@ pattern = utils_str_replace(pattern, "%ws%", whitespace); /* replace any %template% wildcards */ - pattern = snippets_replace_wildcards(doc, pattern); + pattern = snippets_replace_wildcards(editor->document, pattern); /* find the %cursor% pos (has to be done after all other operations) */ step = utils_strpos(pattern, "%cursor%"); @@ -1639,7 +1643,7 @@ if (doc == NULL) return FALSE; - sci = doc->sci; + sci = doc->editor->sci; /* return if we are editing an existing line (chars on right of cursor) */ if (! editor_prefs.complete_snippets_whilst_editing && ! at_eol(sci, pos)) return FALSE; @@ -1654,7 +1658,7 @@ if (! isspace(sci_get_char_at(sci, pos - 1))) /* pos points to the line end char so use pos -1 */ { sci_start_undo_action(sci); /* needed because we insert a space separately from construct */ - result = snippets_complete_constructs(doc, pos, current_word); + result = snippets_complete_constructs(doc->editor, pos, current_word); sci_end_undo_action(sci); if (result) SSM(sci, SCI_CANCEL, 0, 0); /* cancel any autocompletion list, etc */ @@ -1679,9 +1683,9 @@ } -static void insert_closing_tag(GeanyDocument *doc, gint pos, gchar ch, const gchar *tag_name) +static void insert_closing_tag(GeanyEditor *editor, gint pos, gchar ch, const gchar *tag_name) { - ScintillaObject *sci = doc->sci; + ScintillaObject *sci = editor->sci; gchar *to_insert = NULL; if (ch == '/') @@ -1702,7 +1706,7 @@ { SSM(sci, SCI_SETSEL, pos, pos); if (utils_str_equal(tag_name, "table")) - editor_auto_table(doc, pos); + auto_table(editor, pos); } sci_end_undo_action(sci); g_free(to_insert); @@ -1715,9 +1719,9 @@ * @param ch The character we are dealing with, currently only works with the '>' character * @return True if handled, false otherwise */ -static gboolean handle_xml(GeanyDocument *doc, gchar ch) +static gboolean handle_xml(GeanyEditor *editor, gchar ch) { - ScintillaObject *sci = doc->sci; + ScintillaObject *sci = editor->sci; gint lexer = SSM(sci, SCI_GETLEXER, 0, 0); gint pos, min; gchar *str_found, sel[512]; @@ -1731,7 +1735,7 @@ pos = sci_get_current_position(sci); /* return if we are in PHP but not in a string or outside of <? ?> tags */ - if (doc->file_type->id == GEANY_FILETYPES_PHP) + if (editor->document->file_type->id == GEANY_FILETYPES_PHP) { gint style = sci_get_style_at(sci, pos); if (style != SCE_HPHP_SIMPLESTRING && style != SCE_HPHP_HSTRING && @@ -1774,7 +1778,7 @@ } else if (NZV(str_found)) { - insert_closing_tag(doc, pos, ch, str_found); + insert_closing_tag(editor, pos, ch, str_found); result = TRUE; } g_free(str_found); @@ -1782,15 +1786,15 @@ } -static void editor_auto_table(GeanyDocument *doc, gint pos) +static void auto_table(GeanyEditor *editor, gint pos) { - ScintillaObject *sci = doc->sci; + ScintillaObject *sci = editor->sci; gchar *table; gint indent_pos; if (SSM(sci, SCI_GETLEXER, 0, 0) != SCLEX_HTML) return; - get_indent(doc, pos, TRUE); + get_indent(editor, 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>") */ { @@ -1829,9 +1833,9 @@ str_end = g_strdup_printf("%s%s", doc->file_type->comment_close, eol); /* insert the comment strings */ - sci_insert_text(doc->sci, line_start, str_begin); - line_len = sci_get_position_from_line(doc->sci, last_line + 2); - sci_insert_text(doc->sci, line_len, str_end); + sci_insert_text(doc->editor->sci, line_start, str_begin); + line_len = sci_get_position_from_line(doc->editor->sci, last_line + 2); + sci_insert_text(doc->editor->sci, line_len, str_end); g_free(str_begin); g_free(str_end); @@ -1849,28 +1853,28 @@ /* remove comment open chars */ pos = document_find_text(doc, doc->file_type->comment_open, 0, TRUE, FALSE, NULL); - SSM(doc->sci, SCI_DELETEBACK, 0, 0); + SSM(doc->editor->sci, SCI_DELETEBACK, 0, 0); /* check whether the line is empty and can be deleted */ - line = sci_get_line_from_position(doc->sci, pos); - len = sci_get_line_length(doc->sci, line); - linebuf = sci_get_line(doc->sci, line); + line = sci_get_line_from_position(doc->editor->sci, pos); + len = sci_get_line_length(doc->editor->sci, line); + linebuf = sci_get_line(doc->editor->sci, line); x = 0; while (linebuf[x] != '\0' && isspace(linebuf[x])) x++; - if (x == len) SSM(doc->sci, SCI_LINEDELETE, 0, 0); + if (x == len) SSM(doc->editor->sci, SCI_LINEDELETE, 0, 0); g_free(linebuf); /* remove comment close chars */ pos = document_find_text(doc, doc->file_type->comment_close, 0, FALSE, FALSE, NULL); - SSM(doc->sci, SCI_DELETEBACK, 0, 0); + SSM(doc->editor->sci, SCI_DELETEBACK, 0, 0); /* check whether the line is empty and can be deleted */ - line = sci_get_line_from_position(doc->sci, pos); - len = sci_get_line_length(doc->sci, line); - linebuf = sci_get_line(doc->sci, line); + line = sci_get_line_from_position(doc->editor->sci, pos); + len = sci_get_line_length(doc->editor->sci, line); + linebuf = sci_get_line(doc->editor->sci, line); x = 0; while (linebuf[x] != '\0' && isspace(linebuf[x])) x++; - if (x == len) SSM(doc->sci, SCI_LINEDELETE, 0, 0); + if (x == len) SSM(doc->editor->sci, SCI_LINEDELETE, 0, 0); g_free(linebuf); } @@ -1894,29 +1898,29 @@ if (line < 0) { /* use selection or current line */ - sel_start = sci_get_selection_start(doc->sci); - sel_end = sci_get_selection_end(doc->sci); + sel_start = sci_get_selection_start(doc->editor->sci); + sel_end = sci_get_selection_end(doc->editor->sci); - first_line = sci_get_line_from_position(doc->sci, sel_start); + first_line = sci_get_line_from_position(doc->editor->sci, sel_start); /* Find the last line with chars selected (not EOL char) */ - last_line = sci_get_line_from_position(doc->sci, + last_line = sci_get_line_from_position(doc->editor->sci, sel_end - editor_get_eol_char_len(doc)); last_line = MAX(first_line, last_line); } else { first_line = last_line = line; - sel_start = sel_end = sci_get_position_from_line(doc->sci, line); + sel_start = sel_end = sci_get_position_from_line(doc->editor->sci, line); } ft = doc->file_type; /* detection of HTML vs PHP code, if non-PHP set filetype to XML */ - line_start = sci_get_position_from_line(doc->sci, first_line); + line_start = sci_get_position_from_line(doc->editor->sci, first_line); if (ft->id == GEANY_FILETYPES_PHP) { - if (sci_get_style_at(doc->sci, line_start) < 118 || - sci_get_style_at(doc->sci, line_start) > 127) + if (sci_get_style_at(doc->editor->sci, line_start) < 118 || + sci_get_style_at(doc->editor->sci, line_start) > 127) ft = filetypes[GEANY_FILETYPES_XML]; } @@ -1929,20 +1933,20 @@ if (co_len == 0) return 0; - SSM(doc->sci, SCI_BEGINUNDOACTION, 0, 0); + SSM(doc->editor->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->sci, i); - line_len = sci_get_line_length(doc->sci, i); + line_start = sci_get_position_from_line(doc->editor->sci, i); + line_len = sci_get_line_length(doc->editor->sci, i); x = 0; buf_len = MIN((gint)sizeof(sel) - 1, line_len - 1); if (buf_len <= 0) continue; - sci_get_text_range(doc->sci, line_start, line_start + buf_len, sel); + sci_get_text_range(doc->editor->sci, line_start, line_start + buf_len, sel); sel[buf_len] = '\0'; while (isspace(sel[x])) x++; @@ -1971,15 +1975,15 @@ continue; } - SSM(doc->sci, SCI_SETSEL, line_start + x, line_start + x + co_len); - sci_replace_sel(doc->sci, ""); + SSM(doc->editor->sci, SCI_SETSEL, line_start + x, line_start + x + co_len); + sci_replace_sel(doc->editor->sci, ""); count++; } /* use multi line comment */ else { gint style_comment; - gint lexer = SSM(doc->sci, SCI_GETLEXER, 0, 0); + gint lexer = SSM(doc->editor->sci, SCI_GETLEXER, 0, 0); /* process only lines which are already comments */ switch (lexer) @@ -1987,8 +1991,8 @@ case SCLEX_XML: case SCLEX_HTML: { - if (sci_get_style_at(doc->sci, line_start) >= 118 && - sci_get_style_at(doc->sci, line_start) <= 127) + if (sci_get_style_at(doc->editor->sci, line_start) >= 118 && + sci_get_style_at(doc->editor->sci, line_start) <= 127) style_comment = SCE_HPHP_COMMENT; else style_comment = SCE_H_COMMENT; break; @@ -1999,7 +2003,7 @@ case SCLEX_D: style_comment = SCE_D_COMMENT; break; default: style_comment = SCE_C_COMMENT; } - if (sci_get_style_at(doc->sci, line_start + x) == style_comment) + if (sci_get_style_at(doc->editor->sci, line_start + x) == style_comment) { real_uncomment_multiline(doc); count = 1; @@ -2011,7 +2015,7 @@ } } } - SSM(doc->sci, SCI_ENDUNDOACTION, 0, 0); + SSM(doc->editor->sci, SCI_ENDUNDOACTION, 0, 0); /* restore selection if there is one * but don't touch the selection if caller is editor_do_comment_toggle */ @@ -2019,14 +2023,14 @@ { if (single_line) { - sci_set_selection_start(doc->sci, sel_start - co_len); - sci_set_selection_end(doc->sci, sel_end - (count * co_len)); + sci_set_selection_start(doc->editor->sci, sel_start - co_len); + sci_set_selection_end(doc->editor->sci, sel_end - (count * co_len)); } else { gint eol_len = editor_get_eol_char_len(doc); - sci_set_selection_start(doc->sci, sel_start - co_len - eol_len); - sci_set_selection_end(doc->sci, sel_end - co_len - eol_len); + sci_set_selection_start(doc->editor->sci, sel_start - co_len - eol_len); + sci_set_selection_end(doc->editor->sci, sel_end - co_len - eol_len); } } @@ -2050,24 +2054,24 @@ if (doc == NULL || doc->file_type == NULL) return; - sel_start = sci_get_selection_start(doc->sci); - sel_end = sci_get_selection_end(doc->sci); + sel_start = sci_get_selection_start(doc->editor->sci); + sel_end = sci_get_selection_end(doc->editor->sci); ft = doc->file_type; - first_line = sci_get_line_from_position(doc->sci, - sci_get_selection_start(doc->sci)); + first_line = sci_get_line_from_position(doc->editor->sci, + sci_get_selection_start(doc->editor->sci)); /* Find the last line with chars selected (not EOL char) */ - last_line = sci_get_line_from_position(doc->sci, - sci_get_selection_end(doc->sci) - editor_get_eol_char_len(doc)); + last_line = sci_get_line_from_position(doc->editor->sci, + sci_get_selection_end(doc->editor->sci) - editor_get_eol_char_len(doc)); last_line = MAX(first_line, last_line); /* detection of HTML vs PHP code, if non-PHP set filetype to XML */ - first_line_start = sci_get_position_from_line(doc->sci, first_line); + first_line_start = sci_get_position_from_line(doc->editor->sci, first_line); if (ft->id == GEANY_FILETYPES_PHP) { - if (sci_get_style_at(doc->sci, first_line_start) < 118 || - sci_get_style_at(doc->sci, first_line_start) > 127) + if (sci_get_style_at(doc->editor->sci, first_line_start) < 118 || + sci_get_style_at(doc->editor->sci, first_line_start) > 127) ft = filetypes[GEANY_FILETYPES_XML]; } @@ -2080,20 +2084,20 @@ if (co_len == 0) return; - SSM(doc->sci, SCI_BEGINUNDOACTION, 0, 0); + SSM(doc->editor->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->sci, i); - line_len = sci_get_line_length(doc->sci, i); + line_start = sci_get_position_from_line(doc->editor->sci, i); + line_len = sci_get_line_length(doc->editor->sci, i); x = 0; buf_len = MIN((gint)sizeof(sel) - 1, line_len - 1); if (buf_len < 0) continue; - sci_get_text_range(doc->sci, line_start, line_start + buf_len, sel); + sci_get_text_range(doc->editor->sci, line_start, line_start + buf_len, sel); sel[buf_len] = '\0'; while (isspace(sel[x])) x++; @@ -2127,7 +2131,7 @@ else { gint style_comment; - gint lexer = SSM(doc->sci, SCI_GETLEXER, 0, 0); + gint lexer = SSM(doc->editor->sci, SCI_GETLEXER, 0, 0); /* skip lines which are already comments */ switch (lexer) @@ -2135,8 +2139,8 @@ case SCLEX_XML: case SCLEX_HTML: { - if (sci_get_style_at(doc->sci, line_start) >= 118 && - sci_get_style_at(doc->sci, line_start) <= 127) + if (sci_get_style_at(doc->editor->sci, line_start) >= 118 && + sci_get_style_at(doc->editor->sci, line_start) <= 127) style_comment = SCE_HPHP_COMMENT; else style_comment = SCE_H_COMMENT; break; @@ -2149,7 +2153,7 @@ case SCLEX_PERL: style_comment = SCE_PL_POD; break; default: style_comment = SCE_C_COMMENT; } - if (sci_get_style_at(doc->sci, line_start + x) == style_comment) + if (sci_get_style_at(doc->editor->sci, line_start + x) == style_comment) { real_uncomment_multiline(doc); count_uncommented++; @@ -2166,7 +2170,7 @@ } } - SSM(doc->sci, SCI_ENDUNDOACTION, 0, 0); + SSM(doc->editor->sci, SCI_ENDUNDOACTION, 0, 0); co_len += tm_len; @@ -2178,12 +2182,12 @@ gint a = (first_line_was_comment) ? - co_len : co_len; /* don't modify sel_start when the selection starts within indentation */ - get_indent(doc, sel_start, TRUE); + get_indent(doc->editor, sel_start, TRUE); if ((sel_start - first_line_start) <= (gint) strlen(indent)) a = 0; - sci_set_selection_start(doc->sci, sel_start + a); - sci_set_selection_end(doc->sci, sel_end + + sci_set_selection_start(doc->editor->sci, sel_start + a); + sci_set_selection_end(doc->editor->sci, sel_end + (count_commented * co_len) - (count_uncommented * co_len)); } else @@ -2191,19 +2195,19 @@ gint eol_len = editor_get_eol_char_len(doc); if (count_uncommented > 0) { - sci_set_selection_start(doc->sci, sel_start - co_len - eol_len); - sci_set_selection_end(doc->sci, sel_end - co_len - eol_len); + sci_set_selection_start(doc->editor->sci, sel_start - co_len - eol_len); + sci_set_selection_end(doc->editor->sci, sel_end - co_len - eol_len); } else { - sci_set_selection_start(doc->sci, sel_start + co_len + eol_len); - sci_set_selection_end(doc->sci, sel_end + co_len + eol_len); + sci_set_selection_start(doc->editor->sci, sel_start + co_len + eol_len); + sci_set_selection_end(doc->editor->sci, sel_end + co_len + eol_len); } } } else if (count_uncommented > 0) { - sci_set_current_position(doc->sci, sel_start - co_len, TRUE); + sci_set_current_position(doc->editor->sci, sel_start - co_len, TRUE); } } @@ -2223,29 +2227,29 @@ if (line < 0) { /* use selection or current line */ - sel_start = sci_get_selection_start(doc->sci); - sel_end = sci_get_selection_end(doc->sci); + sel_start = sci_get_selection_start(doc->editor->sci); + sel_end = sci_get_selection_end(doc->editor->sci); - first_line = sci_get_line_from_position(doc->sci, sel_start); + first_line = sci_get_line_from_position(doc->editor->sci, sel_start); /* Find the last line with chars selected (not EOL char) */ - last_line = sci_get_line_from_position(doc->sci, + last_line = sci_get_line_from_position(doc->editor->sci, sel_end - editor_get_eol_char_len(doc)); last_line = MAX(first_line, last_line); } else { first_line = last_line = line; - sel_start = sel_end = sci_get_position_from_line(doc->sci, line); + sel_start = sel_end = sci_get_position_from_line(doc->editor->sci, line); } ft = doc->file_type; /* detection of HTML vs PHP code, if non-PHP set filetype to XML */ - line_start = sci_get_position_from_line(doc->sci, first_line); + line_start = sci_get_position_from_line(doc->editor->sci, first_line); if (ft->id == GEANY_FILETYPES_PHP) { - if (sci_get_style_at(doc->sci, line_start) < 118 || - sci_get_style_at(doc->sci, line_start) > 127) + if (sci_get_style_at(doc->editor->sci, line_start) < 118 || + sci_get_style_at(doc->editor->sci, line_start) > 127) ft = filetypes[GEANY_FILETYPES_XML]; } @@ -2258,20 +2262,20 @@ if (co_len == 0) return; - SSM(doc->sci, SCI_BEGINUNDOACTION, 0, 0); + SSM(doc->editor->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->sci, i); - line_len = sci_get_line_length(doc->sci, i); + line_start = sci_get_position_from_line(doc->editor->sci, i); + line_len = sci_get_line_length(doc->editor->sci, i); x = 0; buf_len = MIN((gint)sizeof(sel) - 1, line_len - 1); if (buf_len < 0) continue; - sci_get_text_range(doc->sci, line_start, line_start + buf_len, sel); + sci_get_text_range(doc->editor->sci, line_start, line_start + buf_len, sel); sel[buf_len] = '\0'; while (isspace(sel[x])) x++; @@ -2291,17 +2295,17 @@ if (toggle) { gchar *text = g_strconcat(co, GEANY_TOGGLE_MARK, NULL); - sci_insert_text(doc->sci, start, text); + sci_insert_text(doc->editor->sci, start, text); g_free(text); } else - sci_insert_text(doc->sci, start, co); + sci_insert_text(doc->editor->sci, start, co); } /* use multi line comment */ else { gint style_comment; - gint lexer = SSM(doc->sci, SCI_GETLEXER, 0, 0); + gint lexer = SSM(doc->editor->sci, SCI_GETLEXER, 0, 0); /* skip lines which are already comments */ switch (lexer) @@ -2309,8 +2313,8 @@ case SCLEX_XML: case SCLEX_HTML: { - if (sci_get_style_at(doc->sci, line_start) >= 118 && - sci_get_style_at(doc->sci, line_start) <= 127) + if (sci_get_style_at(doc->editor->sci, line_start) >= 118 && + sci_get_style_at(doc->editor->sci, line_start) <= 127) style_comment = SCE_HPHP_COMMENT; else style_comment = SCE_H_COMMENT; break; @@ -2321,7 +2325,7 @@ case SCLEX_D: style_comment = SCE_D_COMMENT; break; default: style_comment = SCE_C_COMMENT; } - if (sci_get_style_at(doc->sci, line_start + x) == style_comment) continue; + if (sci_get_style_at(doc->editor->sci, line_start + x) == style_comment) continue; real_comment_multiline(doc, line_start, last_line); @@ -2331,7 +2335,7 @@ } } } - SSM(doc->sci, SCI_ENDUNDOACTION, 0, 0); + SSM(doc->editor->sci, SCI_ENDUNDOACTION, 0, 0); /* restore selection if there is one * but don't touch the selection if caller is editor_do_comment_toggle */ @@ -2339,14 +2343,14 @@ { if (single_line) { - sci_set_selection_start(doc->sci, sel_start + co_len); - sci_set_selection_end(doc->sci, sel_end + ((i - first_line) * co_len)); + sci_set_selection_start(doc->editor->sci, sel_start + co_len); + sci_set_selection_end(doc->editor->sci, sel_end + ((i - first_line) * co_len)); } else { gint eol_len = editor_get_eol_char_len(doc); - sci_set_selection_start(doc->sci, sel_start + co_len + eol_len); - sci_set_selection_end(doc->sci, sel_end + co_len + eol_len); + sci_set_selection_start(doc->editor->sci, sel_start + co_len + eol_len); + sci_set_selection_end(doc->editor->sci, sel_end + co_len + eol_len); } } } @@ -2386,10 +2390,11 @@ } -static void auto_multiline(GeanyDocument *doc, gint pos) +static void auto_multiline(GeanyEditor *editor, gint pos) { - ScintillaObject *sci = doc->sci; - gint style = SSM(sci, SCI_GETSTYLEAT, pos - 1 - editor_get_eol_char_len(doc), 0); + ScintillaObject *sci = editor->sci; + gint eol_len = editor_get_eol_char_len(editor->document); + gint style = SSM(sci, SCI_GETSTYLEAT, pos - 1 - eol_len, 0); gint lexer = SSM(sci, SCI_GETLEXER, 0, 0); if ((lexer == SCLEX_CPP && (style == SCE_C_COMMENT || style == SCE_C_COMMENTDOC)) || @@ -2667,22 +2672,25 @@ gint line; gint pos; gboolean have_multiline_comment = FALSE; + GeanyEditor *editor; if (doc == NULL || doc->file_type == NULL || doc->file_type->comment_open == NULL) return; + editor = doc->editor; if (doc->file_type->comment_close != NULL && strlen(doc->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->sci, editor_info.click_pos); - pos = sci_get_position_from_line(doc->sci, line); + line = sci_get_line_from_position(editor->sci, editor_info.click_pos); + pos = sci_get_position_from_line(editor->sci, line); /* use the indent on the current line but only when comment indentation is used * and we don't have multi line comment characters */ - if (doc->auto_indent && ! have_multiline_comment && doc->file_type->comment_use_indent) + if (editor->auto_indent && + ! have_multiline_comment && doc->file_type->comment_use_indent) { - get_indent(doc, editor_info.click_pos, TRUE); + get_indent(editor, editor_info.click_pos, TRUE); text = g_strdup_printf("%s\n%s\n%s\n", indent, indent, indent); text_len = strlen(text); } @@ -2691,13 +2699,13 @@ text = g_strdup("\n\n\n"); text_len = 3; } - sci_insert_text(doc->sci, pos, text); + sci_insert_text(editor->sci, pos, text); g_free(text); /* select the inserted lines for commenting */ - sci_set_selection_start(doc->sci, pos); - sci_set_selection_end(doc->sci, pos + text_len); + sci_set_selection_start(editor->sci, pos); + sci_set_selection_end(editor->sci, pos + text_len); editor_do_comment(doc, -1, TRUE, FALSE); @@ -2710,9 +2718,9 @@ else pos += strlen(indent); - sci_set_current_position(doc->sci, pos, TRUE); + sci_set_current_position(editor->sci, pos, TRUE); /* reset the selection */ - sci_set_anchor(doc->sci, pos); + sci_set_anchor(editor->sci, pos); } @@ -2742,11 +2750,11 @@ } -void editor_insert_alternative_whitespace(GeanyDocument *doc) +void editor_insert_alternative_whitespace(GeanyEditor *editor) { - /* creates and inserts one tabulator sign or whitespace of the amount of the tab width */ - gchar *text = get_whitespace(editor_prefs.tab_width, ! doc->use_tabs); - sci_add_text(doc->sci, text); + /* creates and inserts one tab or whitespace of the amount of the tab width */ + gchar *text = get_whitespace(editor_prefs.tab_width, ! editor->use_tabs); + sci_add_text(editor->sci, text); g_free(text); } @@ -2887,18 +2895,18 @@ { /* skip the first line or if the indentation of the previous and current line are equal */ if (i == 0 || - SSM(doc->sci, SCI_GETLINEINDENTATION, i - 1, 0) == - SSM(doc->sci, SCI_GETLINEINDENTATION, i, 0)) + SSM(doc->editor->sci, SCI_GETLINEINDENTATION, i - 1, 0) == + SSM(doc->editor->sci, SCI_GETLINEINDENTATION, i, 0)) continue; - sel_start = SSM(doc->sci, SCI_POSITIONFROMLINE, i, 0); - sel_end = SSM(doc->sci, SCI_GETLINEINDENTPOSITION, i, 0); + sel_start = SSM(doc->editor->sci, SCI_POSITIONFROMLINE, i, 0); + sel_end = SSM(doc->editor->sci, SCI_GETLINEINDENTPOSITION, i, 0); if (sel_start < sel_end) { - SSM(doc->sci, SCI_SETSEL, sel_start, sel_end); - sci_replace_sel(doc->sci, ""); + SSM(doc->editor->sci, SCI_SETSEL, sel_start, sel_end); + sci_replace_sel(doc->editor->sci, ""); } - sci_insert_text(doc->sci, sel_start, indent); + sci_insert_text(doc->editor->sci, sel_start, indent); } } @@ -2912,7 +2920,7 @@ g_return_if_fail(doc != NULL); - sci = doc->sci; + sci = doc->editor->sci; first_sel_start = sci_get_selection_start(sci); first_sel_end = sci_get_selection_end(sci); @@ -2929,7 +2937,7 @@ /* get previous line and use it for get_indent to use that line * (otherwise it would fail on a line only containing "{" in advanced indentation mode) */ - get_indent(doc, sci_get_position_from_line(sci, first_line - 1), TRUE); + get_indent(doc->editor, sci_get_position_from_line(sci, first_line - 1), TRUE); smart_line_indentation(doc, first_line, last_line); @@ -2960,33 +2968,33 @@ g_return_if_fail(doc != NULL); - sel_start = sci_get_selection_start(doc->sci); - sel_end = sci_get_selection_end(doc->sci); + sel_start = sci_get_selection_start(doc->editor->sci); + sel_end = sci_get_selection_end(doc->editor->sci); - first_line = sci_get_line_from_position(doc->sci, sel_start); + first_line = sci_get_line_from_position(doc->editor->sci, sel_start); /* Find the last line with chars selected (not EOL char) */ - last_line = sci_get_line_from_position(doc->sci, sel_end - editor_get_eol_char_len(doc)); + last_line = sci_get_line_from_position(doc->editor->sci, sel_end - editor_get_eol_char_len(doc)); last_line = MAX(first_line, last_line); if (pos == -1) pos = sel_start; - SSM(doc->sci, SCI_BEGINUNDOACTION, 0, 0); + SSM(doc->editor->sci, SCI_BEGINUNDOACTION, 0, 0); for (i = first_line; i <= last_line; i++) { - indentation_end = SSM(doc->sci, SCI_GETLINEINDENTPOSITION, i, 0); + indentation_end = SSM(doc->editor->sci, SCI_GETLINEINDENTPOSITION, i, 0); if (decrease) { - line_start = SSM(doc->sci, SCI_POSITIONFROMLINE, i, 0); + line_start = SSM(doc->editor->sci, SCI_POSITIONFROMLINE, i, 0); /* searching backwards for a space to remove */ - while (sci_get_char_at(doc->sci, indentation_end) != ' ' && indentation_end > line_start) + while (sci_get_char_at(doc->editor->sci, indentation_end) != ' ' && indentation_end > line_start) indentation_end--; - if (sci_get_char_at(doc->sci, indentation_end) == ' ') + if (sci_get_char_at(doc->editor->sci, indentation_end) == ' ') { - SSM(doc->sci, SCI_SETSEL, indentation_end, indentation_end + 1); - sci_replace_sel(doc->sci, ""); + SSM(doc->editor->sci, SCI_SETSEL, indentation_end, indentation_end + 1); + sci_replace_sel(doc->editor->sci, ""); count--; if (i == first_line) first_line_offset = -1; @@ -2994,7 +3002,7 @@ } else { - sci_insert_text(doc->sci, indentation_end, " "); + sci_insert_text(doc->editor->sci, indentation_end, " "); count++; if (i == first_line) first_line_offset = 1; @@ -3007,15 +3015,15 @@ gint start = sel_start + first_line_offset; if (first_line_offset < 0) start = MAX(sel_start + first_line_offset, - SSM(doc->sci, SCI_POSITIONFROMLINE, first_line, 0)); + SSM(doc->editor->sci, SCI_POSITIONFROMLINE, first_line, 0)); - sci_set_selection_start(doc->sci, start); - sci_set_selection_end(doc->sci, sel_end + count); + sci_set_selection_start(doc->editor->sci, start); + sci_set_selection_end(doc->editor->sci, sel_end + count); } else - sci_set_current_position(doc->sci, pos + count, FALSE); + sci_set_current_position(doc->editor->sci, pos + count, FALSE); - SSM(doc->sci, SCI_ENDUNDOACTION, 0, 0); + SSM(doc->editor->sci, SCI_ENDUNDOACTION, 0, 0); } @@ -3035,18 +3043,18 @@ if (doc == NULL) return NULL; - if (sci_get_lines_selected(doc->sci) == 1) + if (sci_get_lines_selected(doc->editor->sci) == 1) { - gint len = sci_get_selected_text_length(doc->sci); + gint len = sci_get_selected_text_length(doc->editor->sci); s = g_malloc(len + 1); - sci_get_selected_text(doc->sci, s); + sci_get_selected_text(doc->editor->sci, s); } - else if (sci_get_lines_selected(doc->sci) == 0 && use_current_word) + else if (sci_get_lines_selected(doc->editor->sci) == 0 && use_current_word) { /* use the word at current cursor position */ gchar word[GEANY_MAX_WORD_LENGTH]; - editor_find_current_word(doc->sci, -1, word, sizeof(word), wordchars); + editor_find_current_word(doc->editor->sci, -1, word, sizeof(word), wordchars); if (word[0] != '\0') s = g_strdup(word); } @@ -3076,70 +3084,70 @@ /* If the current line is outside the current view window, scroll the line * so it appears at percent_of_view. */ -void editor_display_current_line(GeanyDocument *doc, gfloat percent_of_view) +void editor_display_current_line(GeanyEditor *editor, gfloat percent_of_view) { - ScintillaObject *sci = doc->sci; + ScintillaObject *sci = editor->sci; gint line = sci_get_current_line(sci); /* unfold maybe folded results */ - sci_ensure_line_is_visible(doc->sci, line); + sci_ensure_line_is_visible(editor->sci, line); /* scroll the line if it's off screen */ if (! editor_line_in_view(sci, line)) - doc->scroll_percent = percent_of_view; + editor->scroll_percent = percent_of_view; } /** - * Deletes all currently set indicators in the @a document. + * Deletes all currently set indicators in the @a editor window. * Error indicators (red squiggly underlines) and usual line markers are removed. * - * @param doc The document to operate on. + * @param editor The editor to operate on. **/ -void editor_clear_indicators(GeanyDocument *doc) +void editor_clear_indicators(GeanyEditor *editor) { glong last_pos; - g_return_if_fail(doc != NULL); + g_return_if_fail(editor != NULL); - last_pos = sci_get_length(doc->sci); + last_pos = sci_get_length(editor->sci); if (last_pos > 0) { - sci_start_styling(doc->sci, 0, INDIC2_MASK); - sci_set_styling(doc->sci, last_pos, 0); + sci_start_styling(editor->sci, 0, INDIC2_MASK); + sci_set_styling(editor->sci, last_pos, 0); } - sci_marker_delete_all(doc->sci, 0); /* remove the yellow error line marker */ + sci_marker_delete_all(editor->sci, 0); /* remove the yellow error line marker */ } /** - * This is a convenience function for document_set_indicator(). It sets an error indicator + * This is a convenience function for editor_set_indicator(). It sets an error indicator * (red squiggly underline) on the whole given line. * Whitespace at the start and the end of the line is not marked. * - * @param doc The document to operate on. + * @param editor The editor to operate on. * @param line The line number which should be marked. **/ -void editor_set_indicator_on_line(GeanyDocument *doc, gint line) +void editor_set_indicator_on_line(GeanyEditor *editor, gint line) { gint start, end; guint i = 0, len; gchar *linebuf; - if (doc == NULL) + if (editor == NULL) return; - start = sci_get_position_from_line(doc->sci, line); - end = sci_get_position_from_line(doc->sci, line + 1); + start = sci_get_position_from_line(editor->sci, line); + end = sci_get_position_from_line(editor->sci, line + 1); /* skip blank lines */ if ((start + 1) == end || - sci_get_line_length(doc->sci, line) == editor_get_eol_char_len(doc)) + sci_get_line_length(editor->sci, line) == editor_get_eol_char_len(editor->document)) return; /* don't set the indicator on whitespace */ len = end - start; - linebuf = sci_get_line(doc->sci, line); + linebuf = sci_get_line(editor->sci, line); while (isspace(linebuf[i])) i++; while (len > 1 && len > i && isspace(linebuf[len-1])) @@ -3149,7 +3157,7 @@ } g_free(linebuf); - editor_set_indicator(doc, start + i, end); + editor_set_indicator(editor, start + i, end); } @@ -3158,23 +3166,23 @@ * No error checking or whitespace removal is performed, this should be done by the calling * function if necessary. * - * @param doc The document to operate on. + * @param editor The editor to operate on. * @param start The starting position for the marker. * @param end The ending position for the marker. **/ -void editor_set_indicator(GeanyDocument *doc, gint start, gint end) +void editor_set_indicator(GeanyEditor *editor, gint start, gint end) { gint current_mask; - if (doc == NULL || start >= end) + if (editor == NULL || start >= end) return; - current_mask = sci_get_style_at(doc->sci, start); + current_mask = sci_get_style_at(editor->sci, start); current_mask &= INDICS_MASK; current_mask |= INDIC2_MASK; - sci_start_styling(doc->sci, start, INDIC2_MASK); - sci_set_styling(doc->sci, end - start, current_mask); + sci_start_styling(editor->sci, start, INDIC2_MASK); + sci_set_styling(editor->sci, end - start, current_mask); } @@ -3184,26 +3192,26 @@ { g_return_if_fail(doc != NULL); - if (sci_can_copy(doc->sci)) + if (sci_can_copy(doc->editor->sci)) { - gint start = sci_get_selection_start(doc->sci); + gint start = sci_get_selection_start(doc->editor->sci); const gchar *replacement = colour; - if (sci_get_char_at(doc->sci, start) == '0' && - sci_get_char_at(doc->sci, start + 1) == 'x') + if (sci_get_char_at(doc->editor->sci, start) == '0' && + sci_get_char_at(doc->editor->sci, start + 1) == 'x') { - sci_set_selection_start(doc->sci, start + 2); - sci_set_selection_end(doc->sci, start + 8); + sci_set_selection_start(doc->editor->sci, start + 2); + sci_set_selection_end(doc->editor->sci, start + 8); replacement++; /* skip the leading "0x" */ } - else if (sci_get_char_at(doc->sci, start - 1) == '#') + else if (sci_get_char_at(doc->editor->sci, start - 1) == '#') { /* double clicking something like #00ffff may only select 00ffff because of wordchars */ replacement++; /* so skip the '#' to only replace the colour value */ } - sci_replace_sel(doc->sci, replacement); + sci_replace_sel(doc->editor->sci, replacement); } else - sci_add_text(doc->sci, colour); + sci_add_text(doc->editor->sci, colour); } @@ -3212,7 +3220,7 @@ if (doc == NULL) return ""; - switch (sci_get_eol_mode(doc->sci)) + switch (sci_get_eol_mode(doc->editor->sci)) { case SC_EOL_CRLF: return _("Win (CRLF)"); break; case SC_EOL_CR: return _("Mac (CR)"); break; @@ -3227,7 +3235,7 @@ if (doc == NULL) return 0; - switch (sci_get_eol_mode(doc->sci)) + switch (sci_get_eol_mode(doc->editor->sci)) { case SC_EOL_CRLF: return 2; break; default: return 1; break; @@ -3241,7 +3249,7 @@ if (doc == NULL) return ""; - switch (sci_get_eol_mode(doc->sci)) + switch (sci_get_eol_mode(doc->editor->sci)) { case SC_EOL_CRLF: return "\r\n"; break; case SC_EOL_CR: return "\r"; break; @@ -3256,19 +3264,19 @@ if (doc == NULL || ! editor_prefs.folding) return; - lines = sci_get_line_count(doc->sci); - first = sci_get_first_visible_line(doc->sci); + lines = sci_get_line_count(doc->editor->sci); + first = sci_get_first_visible_line(doc->editor->sci); for (i = 0; i < lines; i++) { - gint level = sci_get_fold_level(doc->sci, i); + gint level = sci_get_fold_level(doc->editor->sci, i); if (level & SC_FOLDLEVELHEADERFLAG) { - if (sci_get_fold_expanded(doc->sci, i) == want_fold) - sci_toggle_fold(doc->sci, i); + if (sci_get_fold_expanded(doc->editor->sci, i) == want_fold) + sci_toggle_fold(doc->editor->sci, i); } } - editor_scroll_to_line(doc->sci, first, 0.0F); + editor_scroll_to_line(doc->editor->sci, first, 0.0F); } @@ -3294,31 +3302,31 @@ if (doc == NULL) return; - sci_start_undo_action(doc->sci); - tab_len = sci_get_tab_width(doc->sci); + sci_start_undo_action(doc->editor->sci); + tab_len = sci_get_tab_width(doc->editor->sci); ttf.chrg.cpMin = 0; - ttf.chrg.cpMax = sci_get_length(doc->sci); + ttf.chrg.cpMax = sci_get_length(doc->editor->sci); ttf.lpstrText = (gchar*) "\t"; while (TRUE) { - search_pos = sci_find_text(doc->sci, SCFIND_MATCHCASE, &ttf); + search_pos = sci_find_text(doc->editor->sci, SCFIND_MATCHCASE, &ttf); if (search_pos == -1) break; - pos_in_line = sci_get_col_from_position(doc->sci,search_pos); + pos_in_line = sci_get_col_from_position(doc->editor->sci,search_pos); current_tab_true_length = tab_len - (pos_in_line % tab_len); tab_str = g_strnfill(current_tab_true_length, ' '); - sci_target_start(doc->sci, search_pos); - sci_target_end(doc->sci, search_pos + 1); - sci_target_replace(doc->sci, tab_str, FALSE); + sci_target_start(doc->editor->sci, search_pos); + sci_target_end(doc->editor->sci, search_pos + 1); + sci_target_replace(doc->editor->sci, tab_str, FALSE); /* next search starts after replacement */ ttf.chrg.cpMin = search_pos + current_tab_true_length - 1; /* update end of range now text has changed */ ttf.chrg.cpMax += current_tab_true_length - 1; g_free(tab_str); } - sci_end_undo_action(doc->sci); + sci_end_undo_action(doc->editor->sci); } @@ 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: [2778] trunk/po
by frlan＠users.sourceforge.net 15 Jul '08

15 Jul '08

Revision: 2778 http://geany.svn.sourceforge.net/geany/?rev=2778&view=rev Author: frlan Date: 2008-07-14 16:43:21 -0700 (Mon, 14 Jul 2008) Log Message: ----------- Update of German translation Modified Paths: -------------- trunk/po/ChangeLog trunk/po/de.po Modified: trunk/po/ChangeLog =================================================================== --- trunk/po/ChangeLog 2008-07-14 18:27:20 UTC (rev 2777) +++ trunk/po/ChangeLog 2008-07-14 23:43:21 UTC (rev 2778) @@ -1,3 +1,9 @@ +2008-07-15 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * de.po: Update of German translation to correct a couple of wrong + translations. Thanks for input to Mario. + + 2008-07-03 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * de.po: Minor improvements of German translation. Thanks to Enrico Modified: trunk/po/de.po =================================================================== --- trunk/po/de.po 2008-07-14 18:27:20 UTC (rev 2777) +++ trunk/po/de.po 2008-07-14 23:43:21 UTC (rev 2778) @@ -9,9 +9,9 @@ msgstr "" "Project-Id-Version: geany 0.15svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-07-06 19:50+0200\n" -"PO-Revision-Date: 2008-06-12 00:03+0100\n" -"Last-Translator: Dominic Hopf <dh(a)dmaphy.de>\n" +"POT-Creation-Date: 2008-07-15 01:40+0200\n" +"PO-Revision-Date: 2008-07-13 18:58+0100\n" +"Last-Translator: Frank Lanitz\n" "Language-Team: German <geany-i18n(a)uvena.de>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" @@ -204,9 +204,8 @@ msgstr "Nächster _Fehler" #: ../src/build.c:1109 ../src/build.c:1226 -#, fuzzy msgid "_Previous Error" -msgstr "_Vorheriges" +msgstr "_Vorheriger Fehler" #: ../src/build.c:1124 ../src/interface.c:1142 msgid "Run or view the current file" @@ -358,7 +357,7 @@ msgid "Do you really want to quit?" msgstr "Soll Geany wirklich beendet werden?" -#: ../src/callbacks.c:467 ../src/document.c:2479 ../src/interface.c:363 +#: ../src/callbacks.c:467 ../src/document.c:2482 ../src/interface.c:363 #: ../src/treeviews.c:459 msgid "_Reload" msgstr "_Neu laden" @@ -428,12 +427,11 @@ msgstr "Keine weiteren Nachrichten." #: ../src/callbacks.c:2234 -#, fuzzy msgid "Configuration files reloaded." -msgstr "Kompilierung fehlgeschlagen." +msgstr "Einstellungen erneut geladen." #. initialize the dialog -#: ../src/dialogs.c:178 ../src/prefs.c:1565 +#: ../src/dialogs.c:178 ../src/prefs.c:1586 msgid "Open File" msgstr "Datei öffnen" @@ -453,7 +451,7 @@ msgid "Detect by file extension" msgstr "Durch Dateiendung erkennen" -#: ../src/dialogs.c:231 ../src/interface.c:3630 +#: ../src/dialogs.c:231 ../src/interface.c:3636 msgid "Detect from file" msgstr "Aus Datei lesen" @@ -651,7 +649,7 @@ msgid "New file \"%s\" opened." msgstr "Neue Datei \"%s\" geöffnet." -#: ../src/document.c:781 ../src/document.c:1180 +#: ../src/document.c:781 ../src/document.c:1183 #, c-format msgid "Could not open file %s (%s)" msgstr "Konnte Datei '%s' nicht öffnen (%s)." @@ -683,38 +681,38 @@ "Die Datei \"%s\" scheint keine Textdatei zu sein, oder die Zeichenkodierung " "wird nicht unterstützt." -#: ../src/document.c:928 +#: ../src/document.c:931 #, c-format msgid "Setting %s indentation mode." msgstr "Modus für automatische Einrückung auf %s eingestellt." -#: ../src/document.c:929 +#: ../src/document.c:932 msgid "Tabs" msgstr "Tabulatoren" -#: ../src/document.c:929 +#: ../src/document.c:932 msgid "Spaces" msgstr "Leerzeichen" -#: ../src/document.c:964 +#: ../src/document.c:967 msgid "Invalid filename" msgstr "Ungültiger Dateiname" -#: ../src/document.c:1075 +#: ../src/document.c:1078 #, c-format msgid "File %s reloaded." msgstr "Datei %s neu geladen." -#: ../src/document.c:1077 +#: ../src/document.c:1080 #, c-format msgid "File %s opened(%d%s)." msgstr "Datei %s geöffnet (%d%s)." -#: ../src/document.c:1079 +#: ../src/document.c:1082 msgid ", read-only" msgstr ", schreibgeschützt" -#: ../src/document.c:1278 +#: ../src/document.c:1281 #, c-format msgid "" "An error occurred while converting the file from UTF-8 in \"%s\". The file " @@ -723,7 +721,7 @@ "Beim Konvertieren der Datei von UTF-8 nach \"%s\" ist ein Fehler " "aufgetreten. Die Datei bleibt ungespeichert." -#: ../src/document.c:1300 +#: ../src/document.c:1303 #, c-format msgid "" "Error message: %s\n" @@ -732,52 +730,52 @@ "Fehlermeldung: %s\n" "Der Fehler trat bei \"%s\" (Zeile: %d, Spalte: %d) auf." -#: ../src/document.c:1305 +#: ../src/document.c:1308 #, c-format msgid "Error message: %s." msgstr "Fehlermeldung: %s." -#: ../src/document.c:1381 ../src/document.c:1437 +#: ../src/document.c:1384 ../src/document.c:1440 msgid "Error saving file." msgstr "Fehler beim Speichern der Datei." -#: ../src/document.c:1435 +#: ../src/document.c:1438 #, c-format msgid "Error saving file (%s)." msgstr "Fehler beim Speichern der Datei (%s)." -#: ../src/document.c:1472 +#: ../src/document.c:1475 #, c-format msgid "File %s saved." msgstr "Datei %s wurde gespeichert." -#: ../src/document.c:1540 ../src/document.c:1595 ../src/document.c:1603 +#: ../src/document.c:1543 ../src/document.c:1598 ../src/document.c:1606 #, c-format msgid "\"%s\" was not found." msgstr "\"%s\" wurde nicht gefunden." -#: ../src/document.c:1603 +#: ../src/document.c:1606 msgid "Wrap search and find again?" msgstr "Suche vom Dokumentanfang bzw. -ende neu beginnen?" -#: ../src/document.c:1680 ../src/search.c:913 ../src/search.c:1426 +#: ../src/document.c:1683 ../src/search.c:913 ../src/search.c:1426 #: ../src/search.c:1427 #, c-format msgid "No matches found for \"%s\"." msgstr "Keine Treffer für \"%s\" gefunden." -#: ../src/document.c:1691 ../src/document.c:1700 +#: ../src/document.c:1694 ../src/document.c:1703 #, c-format msgid "%s: replaced %d occurrence of \"%s\" with \"%s\"." msgid_plural "%s: replaced %d occurrences of \"%s\" with \"%s\"." msgstr[0] "%s: %d mal wurde \"%s\" mit \"%s\" ersetzt." msgstr[1] "%s: %d mal wurde \"%s\" mit \"%s\" ersetzt." -#: ../src/document.c:2480 +#: ../src/document.c:2483 msgid "Do you want to reload it?" msgstr "Möchten Sie die Datei neu laden?" -#: ../src/document.c:2481 +#: ../src/document.c:2484 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -786,35 +784,36 @@ "Die Datei '%s' auf dem Datenträger ist aktueller als die momentan geöffnete " "Version." -#: ../src/document.c:2523 +#: ../src/document.c:2526 msgid "Try to resave the file?" msgstr "Versuchen die Datei erneut zu speichern?" -#: ../src/document.c:2524 +#: ../src/document.c:2527 #, c-format msgid "File \"%s\" was not found on disk!" msgstr "\"%s\" wurde nicht auf dem Datenträger gefunden." -#: ../src/editor.c:3175 ../src/utils.c:516 +#: ../src/editor.c:3217 ../src/utils.c:516 msgid "Win (CRLF)" msgstr "Win (CRLF)" -#: ../src/editor.c:3176 ../src/utils.c:517 +#: ../src/editor.c:3218 ../src/utils.c:517 msgid "Mac (CR)" msgstr "Mac (CR)" -#: ../src/editor.c:3177 ../src/utils.c:518 +#: ../src/editor.c:3219 ../src/utils.c:518 msgid "Unix (LF)" msgstr "Unix (LF)" -#: ../src/editor.c:3298 -#, fuzzy +#: ../src/editor.c:3340 msgid "Enter Tab Width" msgstr "Tabulatorbreite:" -#: ../src/editor.c:3299 +#: ../src/editor.c:3341 msgid "Enter the amount of spaces which should be replaced by a tab character." msgstr "" +"Geben Sie die Anzahl der Leerzeichen an, welche durch den Tabulator ersetzt " +"werden sollen." #: ../src/encodings.c:75 msgid "Celtic" @@ -952,74 +951,74 @@ #: ../src/filetypes.c:67 ../src/filetypes.c:76 ../src/filetypes.c:86 #: ../src/filetypes.c:95 ../src/filetypes.c:104 ../src/filetypes.c:113 #: ../src/filetypes.c:123 ../src/filetypes.c:132 ../src/filetypes.c:141 -#: ../src/filetypes.c:151 ../src/filetypes.c:160 ../src/filetypes.c:170 -#: ../src/filetypes.c:180 ../src/filetypes.c:189 ../src/filetypes.c:198 -#: ../src/filetypes.c:207 ../src/filetypes.c:216 ../src/filetypes.c:225 -#: ../src/filetypes.c:234 ../src/filetypes.c:273 ../src/filetypes.c:282 -#: ../src/filetypes.c:310 ../src/filetypes.c:319 ../src/filetypes.c:328 -#: ../src/filetypes.c:356 +#: ../src/filetypes.c:150 ../src/filetypes.c:159 ../src/filetypes.c:168 +#: ../src/filetypes.c:178 ../src/filetypes.c:188 ../src/filetypes.c:197 +#: ../src/filetypes.c:206 ../src/filetypes.c:215 ../src/filetypes.c:224 +#: ../src/filetypes.c:233 ../src/filetypes.c:242 ../src/filetypes.c:281 +#: ../src/filetypes.c:290 ../src/filetypes.c:318 ../src/filetypes.c:327 +#: ../src/filetypes.c:336 ../src/filetypes.c:364 #, c-format msgid "%s source file" msgstr "%s Quelldatei" -#: ../src/filetypes.c:243 +#: ../src/filetypes.c:251 msgid "Shell script file" msgstr "Shell-Skript Datei" -#: ../src/filetypes.c:253 +#: ../src/filetypes.c:261 msgid "Makefile" msgstr "Makefile" -#: ../src/filetypes.c:263 +#: ../src/filetypes.c:271 msgid "XML document" msgstr "XML-Dokument" -#: ../src/filetypes.c:292 +#: ../src/filetypes.c:300 msgid "Cascading StyleSheet" msgstr "Cascading StyleSheet" -#: ../src/filetypes.c:301 +#: ../src/filetypes.c:309 msgid "SQL Dump file" msgstr "SQL-Dump Datei" -#: ../src/filetypes.c:337 +#: ../src/filetypes.c:345 msgid "Diff file" msgstr "Diff Daten" -#: ../src/filetypes.c:346 +#: ../src/filetypes.c:354 msgid "Config file" msgstr "Konfigurationsdatei" -#: ../src/filetypes.c:365 +#: ../src/filetypes.c:373 msgid "reStructuredText file" msgstr "reST Quelldatei" -#: ../src/filetypes.c:375 ../src/project.c:273 +#: ../src/filetypes.c:383 ../src/project.c:273 msgid "All files" msgstr "Alle Dateien" -#: ../src/filetypes.c:451 +#: ../src/filetypes.c:459 msgid "_Programming Languages" msgstr "_Kompilersprachen" -#: ../src/filetypes.c:452 +#: ../src/filetypes.c:460 msgid "_Scripting Languages" msgstr "_Interpretersprachen" -#: ../src/filetypes.c:453 +#: ../src/filetypes.c:461 msgid "_Markup Languages" msgstr "_Markup-Sprachen" -#: ../src/filetypes.c:454 +#: ../src/filetypes.c:462 msgid "M_iscellaneous Languages" msgstr "_Sonstige Sprachen" -#: ../src/filetypes.c:488 ../src/interface.c:3580 ../src/templates.c:354 +#: ../src/filetypes.c:496 ../src/interface.c:3586 ../src/templates.c:347 #: ../src/ui_utils.c:139 msgid "None" msgstr "Keiner" -#: ../src/filetypes.c:1002 ../src/win32.c:107 +#: ../src/filetypes.c:1010 ../src/win32.c:107 msgid "All Source" msgstr "Alle Quellen" @@ -1071,9 +1070,8 @@ msgstr "Druckt die aktuelle Datei" #: ../src/interface.c:417 -#, fuzzy msgid "Close Ot_her Documents" -msgstr "Schließt die aktuelle Datei." +msgstr "Inaktive Dateien schließen" #: ../src/interface.c:425 msgid "C_lose All" @@ -1186,12 +1184,11 @@ msgstr "_BSD-Lizenz-Hinweis einfügen" #: ../src/interface.c:607 ../src/interface.c:2312 -#, fuzzy msgid "" "Inserts a BSD license notice (should be done at the beginning of the file)" msgstr "" "Fügt einen kurzen Lizenz-Hinweis auf die BSD-Lizenz ein (sollte am Anfang " -"einer Datei sein)." +"einer Datei stehen)." #: ../src/interface.c:609 ../src/interface.c:2314 msgid "Insert Dat_e" @@ -1226,18 +1223,16 @@ msgstr "Auswahl _finden" #: ../src/interface.c:686 -#, fuzzy msgid "Find Pre_vious Selected" -msgstr "Auswahl _rückwärts finden " +msgstr "_Vorherige Auswahl finden " #: ../src/interface.c:695 msgid "Next _Message" msgstr "Nä_chste Nachricht" #: ../src/interface.c:699 -#, fuzzy msgid "Pr_evious Message" -msgstr "Nächste Nachricht" +msgstr "Vorherige Nachricht" #: ../src/interface.c:708 ../src/interface.c:2372 msgid "_Go to Line" @@ -1306,11 +1301,10 @@ msgstr "D_okument" #: ../src/interface.c:798 -#, fuzzy msgid "_Line Wrapping" msgstr "_Zeilenumbruch" -#: ../src/interface.c:801 ../src/interface.c:3659 +#: ../src/interface.c:801 ../src/interface.c:3665 msgid "" "Wrap the line at the window border and continue it on the next line. Note: " "line wrapping has a high performance cost for large documents so should be " @@ -1321,9 +1315,8 @@ "Rechenleistung und sollte daher auf langsameren Rechnern deaktiviert werden." #: ../src/interface.c:804 -#, fuzzy msgid "Line _Breaking" -msgstr "Zeilen_umbruch" +msgstr "Harter Zeilen_umbruch" #: ../src/interface.c:808 msgid "_Auto-indentation" @@ -1333,11 +1326,11 @@ msgid "In_dent Type" msgstr "Art der _Einrückung" -#: ../src/interface.c:820 ../src/interface.c:3609 +#: ../src/interface.c:820 ../src/interface.c:3615 msgid "_Tabs" msgstr "_Tabulatoren" -#: ../src/interface.c:826 ../src/interface.c:3616 +#: ../src/interface.c:826 ../src/interface.c:3622 msgid "_Spaces" msgstr "_Leerzeichen" @@ -1385,19 +1378,17 @@ msgid "_Replace Tabs by Spaces" msgstr "_Tabulatoren durch Leerzeichen ersetzen" -#: ../src/interface.c:908 ../src/interface.c:4061 +#: ../src/interface.c:908 ../src/interface.c:4067 msgid "Replaces all tabs in document by spaces." msgstr "Ersetzt alle Tabulatoren im Dokument durch Leerzeichen." #: ../src/interface.c:910 -#, fuzzy msgid "Replace Spaces b_y Tabs" -msgstr "_Tabulatoren durch Leerzeichen ersetzen" +msgstr "_Leerzeichen durch Tabulatoren ersetzen" #: ../src/interface.c:913 -#, fuzzy msgid "Replaces all spaces in the document by tab characters." -msgstr "Ersetzt alle Tabulatoren im Dokument durch Leerzeichen." +msgstr "Ersetzt alle Leerzeichen im Dokument durch Tabulatoren." #: ../src/interface.c:920 msgid "_Fold All" @@ -1480,12 +1471,14 @@ #: ../src/interface.c:1014 msgid "_Reload Configuration" -msgstr "" +msgstr "Einstellungen _erneut laden" #: ../src/interface.c:1017 msgid "" "Reload configuration data like snippets, templates and filetype extensions." msgstr "" +"Lädt die Einstellungen der (Code-)Schnipsel, Vorlagen und Dateierweiterungen " +"erneut." #: ../src/interface.c:1023 ../src/interface.c:1030 msgid "_Help" @@ -1611,23 +1604,23 @@ msgid "Scribble" msgstr "Notizen" -#: ../src/interface.c:1999 ../src/interface.c:3492 +#: ../src/interface.c:1999 ../src/interface.c:3498 msgid "Images _and Text" -msgstr "Icons _und Text" +msgstr "Symbole _und Text" -#: ../src/interface.c:2005 ../src/interface.c:3524 +#: ../src/interface.c:2005 ../src/interface.c:3530 msgid "_Images Only" msgstr "Nur _Symbole" -#: ../src/interface.c:2011 ../src/interface.c:3516 +#: ../src/interface.c:2011 ../src/interface.c:3522 msgid "_Text Only" msgstr "Nur _Text" -#: ../src/interface.c:2022 ../src/interface.c:3508 +#: ../src/interface.c:2022 ../src/interface.c:3514 msgid "_Large Icons" msgstr "_Große Symbole" -#: ../src/interface.c:2027 ../src/interface.c:3500 +#: ../src/interface.c:2027 ../src/interface.c:3506 msgid "_Small Icons" msgstr "_Kleine Symbole" @@ -1655,23 +1648,23 @@ msgid "Go to the entered line" msgstr "Springe zu angegebener Zeile" -#: ../src/interface.c:2859 ../src/keybindings.c:302 +#: ../src/interface.c:2865 ../src/keybindings.c:302 msgid "Preferences" msgstr "Einstellungen" -#: ../src/interface.c:2891 +#: ../src/interface.c:2897 msgid "Load files from the last session" msgstr "Dateien aus der letzten Sitzung laden" -#: ../src/interface.c:2895 +#: ../src/interface.c:2901 msgid "Opens at startup the files from the last session" msgstr "Lädt die geöffneten Dateien aus der letzten Sitzung." -#: ../src/interface.c:2898 +#: ../src/interface.c:2904 msgid "Load virtual terminal support" msgstr "Die Virtual Terminal Emulation (VTE) laden" -#: ../src/interface.c:2900 +#: ../src/interface.c:2906 msgid "" "Whether the virtual terminal emulation (VTE) should be loaded at startup. " "Disable it if you do not need it." @@ -1680,39 +1673,39 @@ "soll oder nicht. Wenn sie nicht benötigt wird, sollte dieser Punkt " "deaktiviert werden." -#: ../src/interface.c:2903 +#: ../src/interface.c:2909 msgid "Enable plugin support" msgstr "Plugins aktivieren" -#: ../src/interface.c:2907 +#: ../src/interface.c:2913 msgid "<b>Startup</b>" msgstr "<b>Starten</b>" -#: ../src/interface.c:2926 +#: ../src/interface.c:2932 msgid "Save window position and geometry" msgstr "Fensterposition und -größe speichern" -#: ../src/interface.c:2930 +#: ../src/interface.c:2936 msgid "Saves the window position and geometry and restores it at the start" msgstr "Speichert die Fensterposition und die Fenstergröße." -#: ../src/interface.c:2933 +#: ../src/interface.c:2939 msgid "Confirm exit" msgstr "Beenden bestätigen" -#: ../src/interface.c:2937 +#: ../src/interface.c:2943 msgid "Shows a confirmation dialog on exit." msgstr "Zeigt einen Bestätigungsdialog vor dem Beenden." -#: ../src/interface.c:2940 +#: ../src/interface.c:2946 msgid "<b>Shutdown</b>" msgstr "<b>Beenden </b>" -#: ../src/interface.c:2959 +#: ../src/interface.c:2965 msgid "Use project-based session files" msgstr "Sitzung im Projekt speichern und wieder öffnen" -#: ../src/interface.c:2963 +#: ../src/interface.c:2969 msgid "" "Whether to store a project's session files and open them when re-opening the " "project." @@ -1720,15 +1713,15 @@ "Speichert die geöffneten Dateien (aktuelle Sitzung) zusammen mit dem Projekt " "und öffnet diese Dateien wieder wenn das Projekt geöffnet wird." -#: ../src/interface.c:2966 +#: ../src/interface.c:2972 msgid "<b>Projects</b>" msgstr "<b>Projekte</b>" -#: ../src/interface.c:2985 +#: ../src/interface.c:2991 msgid "Beep on errors or when compilation has finished" msgstr "Bei Fehlern oder beendeter Kompilierung Piepton ausgeben" -#: ../src/interface.c:2988 +#: ../src/interface.c:2994 msgid "" "Whether to beep if an error occurred or when the compilation process has " "finished." @@ -1736,11 +1729,11 @@ "Legt fest, ob bei einem Fehler oder bei beendeter Kompilierung ein »Beep« " "ausgegeben werden soll." -#: ../src/interface.c:2991 +#: ../src/interface.c:2997 msgid "Switch to status message list at new message" msgstr "Bei neuen Meldungen zum Statusmeldungsfenster wechseln" -#: ../src/interface.c:2994 +#: ../src/interface.c:3000 msgid "" "Switch to the status message tab (in the notebook window at the bottom) if a " "new status message arrives." @@ -1748,11 +1741,11 @@ "Wechselt automatisch zu dem Dateireiter mit den Statusmeldungen im " "Infobereich, wenn eine neue Statusmeldung vorliegt." -#: ../src/interface.c:2997 +#: ../src/interface.c:3003 msgid "Suppress status messages in the status bar" msgstr "Statusmeldungen in der Statuszeile unterdrücken" -#: ../src/interface.c:3000 +#: ../src/interface.c:3006 msgid "" "Removes all messages from the status bar. The messages are still displayed " "in the status messages window." @@ -1760,11 +1753,11 @@ "Entfernt alle Nachrichten aus der Statuszeile. Die Nachrichten sind " "weiterhin über den »Status«-Reiter im Infobereich abrufbar." -#: ../src/interface.c:3003 +#: ../src/interface.c:3009 msgid "Auto focus widgets (focus follows mouse)" msgstr "Autofokus (Der Fokus folgt der Maus)" -#: ../src/interface.c:3006 +#: ../src/interface.c:3012 msgid "" "Gives the focus automatically to widgets below the mouse cursor. Works for " "the main editor widget, the scribble, the toolbar search and goto line " @@ -1775,15 +1768,15 @@ "das Hauptfenster, das Notizbuch, den Such- und Springe-zu-Feldern in der " "Werkzeugliste sowie für das Terminal." -#: ../src/interface.c:3009 ../src/interface.c:3339 ../src/interface.c:4120 +#: ../src/interface.c:3015 ../src/interface.c:3345 ../src/interface.c:4126 msgid "<b>Miscellaneous</b>" msgstr "<b>Sonstiges</b>" -#: ../src/interface.c:3030 +#: ../src/interface.c:3036 msgid "Startup path:" msgstr "Startpfad:" -#: ../src/interface.c:3042 +#: ../src/interface.c:3048 msgid "" "Path to start in when opening or saving files. Must be an absolute path. " "Leave blank to use the current working directory." @@ -1792,83 +1785,83 @@ "muss ein absolut sein. Um das aktuelle Arbeitsverzeichnis zu benutzen, " "keinen Pfad eintragen." -#: ../src/interface.c:3055 +#: ../src/interface.c:3061 msgid "Project files:" msgstr "Projektdateien:" -#: ../src/interface.c:3067 +#: ../src/interface.c:3073 msgid "Path to start in when opening project files" msgstr "Pfad zum Öffnen von Projektdateien." -#: ../src/interface.c:3080 +#: ../src/interface.c:3086 msgid "<b>Paths</b>" msgstr "<b>Pfade</b>" -#: ../src/interface.c:3085 +#: ../src/interface.c:3091 msgid "General" msgstr "Allgemein" -#: ../src/interface.c:3107 +#: ../src/interface.c:3113 msgid "Show symbol list" msgstr "Symbol-Ansicht anzeigen" -#: ../src/interface.c:3110 +#: ../src/interface.c:3116 msgid "Toggle the symbol list on and off" msgstr "Schaltet die Symbol-Ansicht ein und aus." -#: ../src/interface.c:3113 +#: ../src/interface.c:3119 msgid "Show documents list" msgstr "Dokumentenliste anzeigen" -#: ../src/interface.c:3116 +#: ../src/interface.c:3122 msgid "Toggle the documents list on and off" msgstr "Schaltet die Dokumentenliste ein und aus." -#: ../src/interface.c:3119 +#: ../src/interface.c:3125 msgid "Show full path name in documents list" msgstr "Zeige den vollständigen Pfad in der Dokumentenliste an" -#: ../src/interface.c:3124 +#: ../src/interface.c:3130 msgid "<b>Sidebar</b>" msgstr "<b>Seitenleiste</b>" -#: ../src/interface.c:3145 +#: ../src/interface.c:3151 msgid "Symbol list:" msgstr "Symbol-Liste:" -#: ../src/interface.c:3152 ../src/interface.c:3264 +#: ../src/interface.c:3158 ../src/interface.c:3270 msgid "Message window:" msgstr "Meldungsfenster:" -#: ../src/interface.c:3159 ../src/interface.c:3298 +#: ../src/interface.c:3165 ../src/interface.c:3304 msgid "Editor:" msgstr "Editor:" -#: ../src/interface.c:3171 +#: ../src/interface.c:3177 msgid "Sets the font for the message window" msgstr "Ändert die Schriftart für das Meldungsfenster im Infobereich." -#: ../src/interface.c:3179 +#: ../src/interface.c:3185 msgid "Sets the font for the symbol list" msgstr "Legt die Schriftart für die Symbol-Ansicht fest." -#: ../src/interface.c:3187 +#: ../src/interface.c:3193 msgid "Sets the editor font" msgstr "Legt die Schriftart für das Editorfenster fest." -#: ../src/interface.c:3189 +#: ../src/interface.c:3195 msgid "<b>Fonts</b>" msgstr "<b>Schriftarten</b>" -#: ../src/interface.c:3208 +#: ../src/interface.c:3214 msgid "Show editor tabs" msgstr "Zeige Karteireiter für geöffnete Dateien" -#: ../src/interface.c:3212 +#: ../src/interface.c:3218 msgid "Show close buttons" msgstr "»Schließen«-Knöpfe anzeigen" -#: ../src/interface.c:3216 +#: ../src/interface.c:3222 msgid "" "Shows a small cross button in the file tabs to easily close files when " "clicking on it (requires restart of Geany)." @@ -1876,215 +1869,215 @@ "Zeigt ein kleines Kreuz auf den Dateireitern zum einfachen schließen einer " "Datei an. (Option benötigt einen Neustart von Geany zum Aktivieren.)" -#: ../src/interface.c:3223 +#: ../src/interface.c:3229 msgid "Placement of new file tabs:" msgstr "Platzierung neuer Dateien:" -#: ../src/interface.c:3228 ../src/interface.c:3276 ../src/interface.c:3293 -#: ../src/interface.c:3310 +#: ../src/interface.c:3234 ../src/interface.c:3282 ../src/interface.c:3299 +#: ../src/interface.c:3316 msgid "Left" msgstr "Links" -#: ../src/interface.c:3231 +#: ../src/interface.c:3237 msgid "File tabs will be placed on the left of the notebook" msgstr "Neue Dateien werden links von der Datei-Liste platziert." -#: ../src/interface.c:3236 ../src/interface.c:3277 ../src/interface.c:3294 -#: ../src/interface.c:3311 +#: ../src/interface.c:3242 ../src/interface.c:3283 ../src/interface.c:3300 +#: ../src/interface.c:3317 msgid "Right" msgstr "Rechts" -#: ../src/interface.c:3239 +#: ../src/interface.c:3245 msgid "File tabs will be placed on the right of the notebook" msgstr "Neue Dateien werden rechts von der Datei-Liste platziert." -#: ../src/interface.c:3243 +#: ../src/interface.c:3249 msgid "<b>Editor tabs</b>" msgstr "<b>Dateireiter</b>" -#: ../src/interface.c:3278 ../src/interface.c:3295 ../src/interface.c:3312 +#: ../src/interface.c:3284 ../src/interface.c:3301 ../src/interface.c:3318 msgid "Top" msgstr "Oben" -#: ../src/interface.c:3279 ../src/interface.c:3296 ../src/interface.c:3313 +#: ../src/interface.c:3285 ../src/interface.c:3302 ../src/interface.c:3319 msgid "Bottom" msgstr "Unten" -#: ../src/interface.c:3281 +#: ../src/interface.c:3287 msgid "Sidebar:" msgstr "Seitenleiste:" -#: ../src/interface.c:3315 +#: ../src/interface.c:3321 msgid "<b>Tab positions</b>" msgstr "<b>Reiterposition</b>" -#: ../src/interface.c:3334 +#: ../src/interface.c:3340 msgid "Show status bar" msgstr "Statusleiste anzeigen" -#: ../src/interface.c:3337 +#: ../src/interface.c:3343 msgid "Whether to show the status bar at the bottom of the main window." msgstr "" "Legt fest, ob die Statuszeile an der unteren Seite des Fensters angezeigt " "werden soll oder nicht." -#: ../src/interface.c:3344 +#: ../src/interface.c:3350 msgid "Interface" msgstr "Schnittstelle" -#: ../src/interface.c:3362 +#: ../src/interface.c:3368 msgid "Show Toolbar" msgstr "Werkzeugleiste anzeigen" -#: ../src/interface.c:3368 +#: ../src/interface.c:3374 msgid "<b>Toolbar</b>" msgstr "<b>Werkzeugleiste</b>" -#: ../src/interface.c:3387 +#: ../src/interface.c:3393 msgid "Show file operation buttons" msgstr "Dateioperationssymbole anzeigen" -#: ../src/interface.c:3391 +#: ../src/interface.c:3397 msgid "Display the New, Open, Close, Save and Reload buttons in the toolbar" msgstr "" "Zeigt die Symbole für Neu, Öffnen, Schließen und Neuladen in der " "Werkzeugleiste." -#: ../src/interface.c:3394 +#: ../src/interface.c:3400 msgid "Show Redo and Undo buttons" msgstr "Rückgängig und Wiederholen anzeigen" -#: ../src/interface.c:3398 +#: ../src/interface.c:3404 msgid "Display the Redo and Undo buttons in the toolbar" msgstr "" "Zeigt die Symbole zum Rückgängigmachen und Wiederholen in der Werkzeugleiste." -#: ../src/interface.c:3401 +#: ../src/interface.c:3407 msgid "Show Back and Forward buttons" msgstr "Schaltflächen zur Vorwärts- und Rückwärtsnavigation anzeigen" -#: ../src/interface.c:3405 +#: ../src/interface.c:3411 msgid "" "Display the Back and Forward buttons in the toolbar used for code navigation" msgstr "" "Zeigt die Schaltflächen zur Vorwärts- und Rückwärtsnavigation innerhalb der " "Quelltexte in der Werkzeugliste an." -#: ../src/interface.c:3408 +#: ../src/interface.c:3414 msgid "Show Compile and Run buttons" msgstr "Schaltflächen zum Kompilieren und Ausführen anzeigen" -#: ../src/interface.c:3412 +#: ../src/interface.c:3418 msgid "Display the Compile and Run buttons in the toolbar" msgstr "Zeigt die Symbole zum Kompilieren und Ausführen in der Werkzeugleiste." -#: ../src/interface.c:3415 +#: ../src/interface.c:3421 msgid "Show Color Chooser button" msgstr "Farbwähler anzeigen" -#: ../src/interface.c:3419 +#: ../src/interface.c:3425 msgid "Display the Color Chooser button in the toolbar" msgstr "Zeigt das Farbwählersymbol in der Werkzeugleiste." -#: ../src/interface.c:3422 +#: ../src/interface.c:3428 msgid "Show Zoom In and Zoom Out buttons" msgstr "Schaltflächen zum Heran- und Wegzoomen anzeigen" -#: ../src/interface.c:3426 +#: ../src/interface.c:3432 msgid "Display the Zoom In and Zoom Out buttons in the toolbar" msgstr "Zeigt die Symbole zum Heran- und Herauszoomen in der Werkzeugleiste." -#: ../src/interface.c:3429 +#: ../src/interface.c:3435 msgid "Show Increase and Decrease Indentation buttons" msgstr "Schaltflächen zum Verringern/Erhöhen des Einzugs anzeigen" -#: ../src/interface.c:3433 +#: ../src/interface.c:3439 msgid "Display the Increase and Decrease Indentation buttons in the toolbar" msgstr "" "Zeigt die Symbole zum Ein- und Ausrücken von Quelltext in der Werkzeugleiste " "an." -#: ../src/interface.c:3436 +#: ../src/interface.c:3442 msgid "Show Search field" msgstr "Suchfeld anzeigen" -#: ../src/interface.c:3440 +#: ../src/interface.c:3446 msgid "Display the search field and button in the toolbar" msgstr "Zeigt das Suchfeld in der Werkzeugleiste an." -#: ../src/interface.c:3443 +#: ../src/interface.c:3449 msgid "Show Go to Line field" msgstr "Springe zu Zeile-Eingabefeld anzeigen" -#: ../src/interface.c:3447 +#: ../src/interface.c:3453 msgid "Display the line number field and button in the toolbar" msgstr "" "Zeigt das Eingabefeld um in eine bestimmte Zeile zu springen in der " "Werkzeugleiste an." -#: ../src/interface.c:3450 +#: ../src/interface.c:3456 msgid "Show Quit button" -msgstr "Icon zum Beenden anzeigen" +msgstr "Schaltfläche Beenden anzeigen" -#: ../src/interface.c:3454 +#: ../src/interface.c:3460 msgid "Display the quit button in the toolbar" -msgstr "Zeigt das Icon zum Beenden von Geany in der Werkzeugleiste an." +msgstr "Zeigt die Schaltfläche zum Beenden von Geany in der Werkzeugleiste an." -#: ../src/interface.c:3457 +#: ../src/interface.c:3463 msgid "<b>Items</b>" msgstr "<b>Symbole</b>" -#: ../src/interface.c:3478 +#: ../src/interface.c:3484 msgid "Icon style:" msgstr "Symbolstil:" -#: ../src/interface.c:3485 +#: ../src/interface.c:3491 msgid "Icon size:" msgstr "Symbolgröße:" -#: ../src/interface.c:3532 +#: ../src/interface.c:3538 msgid "<b>Appearance</b>" msgstr "<b>Aussehen</b>" -#: ../src/interface.c:3537 +#: ../src/interface.c:3543 msgid "Toolbar" msgstr "Werkzeugleiste" -#: ../src/interface.c:3569 +#: ../src/interface.c:3575 msgid "Auto-indent mode:" msgstr "Modus für automatische Einrückung:" -#: ../src/interface.c:3581 +#: ../src/interface.c:3587 msgid "Basic" msgstr "Einfach" -#: ../src/interface.c:3582 +#: ../src/interface.c:3588 msgid "Current chars" msgstr "Aktuelle Zeichenkette" -#: ../src/interface.c:3583 +#: ../src/interface.c:3589 msgid "Match braces" msgstr "Übereinstimmende Klammerung" -#: ../src/interface.c:3591 +#: ../src/interface.c:3597 msgid "The width in chars, which one tab character will take" msgstr "Die Breite in Zeichen, die ein Tabulator-Zeichen einnimmt" -#: ../src/interface.c:3596 +#: ../src/interface.c:3602 msgid "Tab width:" msgstr "Tabulatorbreite:" -#: ../src/interface.c:3612 ../src/interface.c:3619 +#: ../src/interface.c:3618 ../src/interface.c:3625 msgid "Whether to use tabs or spaces when indentation is inserted." msgstr "" "Legt fest, ob entweder Leerzeichen oder Tabulatoren zum Einrücken genutzt " "werden sollen." -#: ../src/interface.c:3623 ../src/interface.c:3880 +#: ../src/interface.c:3629 ../src/interface.c:3886 msgid "Type:" msgstr "Typ:" -#: ../src/interface.c:3635 +#: ../src/interface.c:3641 msgid "" "Whether to detect the indentation type from file contents when a file is " "opened." @@ -2093,20 +2086,19 @@ "(Tabulatoren oder Leerzeichen) automatisch aus der geöffneten Datei zu " "bestimmen." -#: ../src/interface.c:3637 +#: ../src/interface.c:3643 msgid "<b>Indentation</b>" msgstr "<b>Einrückung</b>" -#: ../src/interface.c:3656 -#, fuzzy +#: ../src/interface.c:3662 msgid "Line wrapping" msgstr "Zeilenumbruch" -#: ../src/interface.c:3661 +#: ../src/interface.c:3667 msgid "Enable \"smart\" home key" msgstr "»Intelligente« Pos1-Taste (Home) aktivieren" -#: ../src/interface.c:3664 +#: ../src/interface.c:3670 msgid "" "When \"smart\" home is enabled, the HOME key will move the caret to the " "first non-blank character of the line, unless it is already there, it moves " @@ -2120,31 +2112,30 @@ "nicht aktiviert ist, springt der Cursor immer zum Beginn der Zeile ohne auf " "die aktuelle Position Rücksicht zu nehmen." -#: ../src/interface.c:3667 +#: ../src/interface.c:3673 msgid "Disable Drag and Drop" msgstr "Drag and Drop deaktivieren" -#: ../src/interface.c:3670 +#: ../src/interface.c:3676 msgid "" "Disable drag and drop completely in the editor window so you can't drag and " "drop any selections within or outside of the editor window." msgstr "Deaktiviert Drag and Drop für das komplette Editorfenster." -#: ../src/interface.c:3673 +#: ../src/interface.c:3679 msgid "Enable folding" msgstr "Quelltext-Ausblendung aktivieren" -#: ../src/interface.c:3676 +#: ../src/interface.c:3682 msgid "Whether to enable folding the code" msgstr "" "Legt fest, ob es möglich sein soll, Teile des Quelltextes auszublenden." -#: ../src/interface.c:3679 +#: ../src/interface.c:3685 msgid "Fold/Unfold all children of a fold point" msgstr "Alle untergeordneten Quelltext-Blöcke ebenfalls ein/ausblenden" -#: ../src/interface.c:3682 -#, fuzzy +#: ../src/interface.c:3688 msgid "" "Fold or unfold all children of a fold point. By pressing the Shift key while " "clicking on a fold symbol the contrary behavior is used." @@ -2153,11 +2144,11 @@ "mit ein und aus. Der Druck auf die Feststelltaste (Shift) während eines " "Klicks auf ein Ausblende-Symbol bewirkt das Gegenteil." -#: ../src/interface.c:3685 +#: ../src/interface.c:3691 msgid "Use indicators to show compile errors" msgstr "Benutzt Markierungen, um Probleme beim Kompilieren anzuzeigen." -#: ../src/interface.c:3688 +#: ../src/interface.c:3694 msgid "" "Whether to use indicators (a squiggly underline) to highlight the lines " "where the compiler found a warning or an error." @@ -2165,34 +2156,33 @@ "Legt fest, ob Markierungen (gewellte Unterstreichungen) benutzt werden " "sollen, um Zeilen mit Fehlern beim Kompiliervorgang zu markieren." -#: ../src/interface.c:3691 +#: ../src/interface.c:3697 msgid "Newline strips trailing spaces" msgstr "Neue Zeile entfernt Leerzeichen am Zeilenende" -#: ../src/interface.c:3694 +#: ../src/interface.c:3700 msgid "Enable newline to strip the trailing spaces on the previous line." msgstr "" "Legt fest, ob unnötige Leerzeichen am Ende einer Zeile automatisch beim " "Wechseln in eine neue Zeile entfernt werden sollen." -#: ../src/interface.c:3701 +#: ../src/interface.c:3707 msgid "Line breaking column:" msgstr "Spalte für den Zeilenumbruch:" -#: ../src/interface.c:3711 +#: ../src/interface.c:3717 msgid "<b>Features</b>" msgstr "<b>Funktionen</b>" -#: ../src/interface.c:3716 -#, fuzzy +#: ../src/interface.c:3722 msgid "Features" -msgstr "<b>Funktionen</b>" +msgstr "Funktionen" -#: ../src/interface.c:3734 +#: ../src/interface.c:3740 msgid "Snippet completion" msgstr "Vervollständigung von (Code-)Schnipseln" -#: ../src/interface.c:3737 +#: ../src/interface.c:3743 msgid "" "Type a defined short character sequence and complete it to a more complex " "string using a single keypress." @@ -2200,20 +2190,19 @@ "Mittels eines Tastenkürzels kann ein kurzer (Code-)Schnipsel zu einem " "komplexeren Text erweitert werden." -#: ../src/interface.c:3740 -#, fuzzy +#: ../src/interface.c:3746 msgid "XML tag auto completion" msgstr "XML-Tag Autovervollständigung" -#: ../src/interface.c:3743 +#: ../src/interface.c:3749 msgid "Automatic completion and closing of XML tags (includes HTML tags)" msgstr "Autovervollständigung von offenen XML-Tags, einschließlich HTML-Tags" -#: ../src/interface.c:3746 +#: ../src/interface.c:3752 msgid "Automatic continuation multi-line comments" msgstr "Automatisches Weiterführen von Mehrzeilenkommentaren." -#: ../src/interface.c:3749 +#: ../src/interface.c:3755 msgid "" "Continue automatically multi-line comments in languages like C, C++ and Java " "when a new line is entered inside such a comment." @@ -2221,11 +2210,11 @@ "Verlängert den Kommentarberiech in den Sprachen C, C++ und Java, wenn eine " "neue Zeile innerhlab eines Kommentares hinzu gefügt wird." -#: ../src/interface.c:3752 +#: ../src/interface.c:3758 msgid "Automatic symbol completion" msgstr "Automatische Vervollständigung von Symbolen" -#: ../src/interface.c:3755 +#: ../src/interface.c:3761 msgid "" "Automatic completion of known symbols in open files (function names, global " "variables, ...)" @@ -2233,22 +2222,21 @@ "Automatische Vervollständigung von bekannten Variablen und Funktionsnamen " "geöffneter Dateien." -#: ../src/interface.c:3770 -#, fuzzy +#: ../src/interface.c:3776 msgid "Number of rows to display in the auto completion list." msgstr "" "Anzahl der Zeilen, die maximal angezeigt werden sollen, wenn die " "Autovervollständigungsliste angezeigt wird." -#: ../src/interface.c:3773 +#: ../src/interface.c:3779 msgid "Characters to type for completion:" msgstr "Zu tippende Zeichen für die Vervollständigung:" -#: ../src/interface.c:3780 +#: ../src/interface.c:3786 msgid "Rows of symbol completion list:" msgstr "Anzahl der Zeilen der Vervollständigungsliste:" -#: ../src/interface.c:3793 +#: ../src/interface.c:3799 msgid "" "The amount of characters which are necessary to show the symbol auto " "completion list." @@ -2256,87 +2244,84 @@ "Die Anzahl der Zeichen, die nötig sind um die Symbol-Vervollständigungsliste " "anzuzeigen." -#: ../src/interface.c:3796 +#: ../src/interface.c:3802 msgid "<b>Completions</b>" msgstr "<b>Vervollständigungen</b>" -#: ../src/interface.c:3801 -#, fuzzy +#: ../src/interface.c:3807 msgid "Completions" -msgstr "<b>Vervollständigungen</b>" +msgstr "Vervollständigungen" -#: ../src/interface.c:3823 +#: ../src/interface.c:3829 msgid "Invert syntax highlighting colors" msgstr "Invertiere Syntax-Hervorhebungen " -#: ../src/interface.c:3825 +#: ../src/interface.c:3831 msgid "Use white text on a black background." msgstr "Benutze weiße Schrift auf einem schwarzem Hintergrund" -#: ../src/interface.c:3827 +#: ../src/interface.c:3833 msgid "Show indentation guides" msgstr "Zeige Einrückungshinweise" -#: ../src/interface.c:3830 +#: ../src/interface.c:3836 msgid "Shows small dotted lines to help you to use the right indentation." msgstr "" "Blendet punktierte Linien ein, um die richtige Einrückung zu erleichtern." -#: ../src/interface.c:3833 +#: ../src/interface.c:3839 msgid "Show white space" msgstr "Zeige Leerzeichen" -#: ../src/interface.c:3836 +#: ../src/interface.c:3842 msgid "Marks spaces with dots and tabs with arrows." msgstr "Markiert Leerzeichen mit Punkten und Tabulatoren mit kleinen Pfeilen." -#: ../src/interface.c:3839 +#: ../src/interface.c:3845 msgid "Show line endings" -msgstr "Zeilenenden anzeigen" +msgstr "Zeige Zeilenenden" -#: ../src/interface.c:3842 +#: ../src/interface.c:3848 msgid "Show the line ending character" msgstr "Zeilenende-Zeichen anzeigen" -#: ../src/interface.c:3845 +#: ../src/interface.c:3851 msgid "<b>Display</b>" msgstr "<b>Anzeige</b>" -#: ../src/interface.c:3866 -#, fuzzy +#: ../src/interface.c:3872 msgid "Long line marker:" -msgstr "Markierung für statischen Zeilenumbruch:" +msgstr "Zeilenlänge markieren bei:" -#: ../src/interface.c:3873 -#, fuzzy +#: ../src/interface.c:3879 msgid "Long line marker color:" -msgstr "Farbe der Markierung für statischen Zeilenumbruch:" +msgstr "Farbe der Markierung:" -#: ../src/interface.c:3892 +#: ../src/interface.c:3898 msgid "Sets the color of the long line marker" -msgstr "Stellt die Farbe des \"long line markers\" ein." +msgstr "Stellt die Farbe der \"Umbruchhilfe für lange Zeilen\" ein." -#: ../src/interface.c:3893 ../src/tools.c:744 ../src/vte.c:736 +#: ../src/interface.c:3899 ../src/tools.c:744 ../src/vte.c:736 #: ../src/vte.c:743 msgid "Color Chooser" msgstr "Farbwähler" -#: ../src/interface.c:3901 +#: ../src/interface.c:3907 msgid "" "The long line marker is a thin vertical line in the editor. It helps to mark " "long lines, or as a hint to break the line. Set this value to a value " "greater than 0 to specify the column where it should appear." msgstr "" -"Die Markierung für statischen Zeilenumbruch ist eine dünne Linie im " +"Die Umbruchhilfe für lange Zeilen ist eine dünne vertikale Linie im " "Editorfenster. Sie hilft dabei, lange Zeilen zu markieren und dabei auf " "einen eventuell notwendigen Zeilenumbruch hinzuweisen. Werte größer als 0 " "geben die Spalte an, in der die Linie angezeigt werden soll." -#: ../src/interface.c:3911 +#: ../src/interface.c:3917 msgid "Line" msgstr "Linie" -#: ../src/interface.c:3914 +#: ../src/interface.c:3920 msgid "" "Prints a vertical line in the editor window at the given cursor position " "(see below)." @@ -2344,11 +2329,11 @@ "Zeichnet eine vertikale Linie im Editorfenster an der angegebenen Cursor-" "Position (nur sinnvoll mit Festbreitenschriften)." -#: ../src/interface.c:3918 +#: ../src/interface.c:3924 msgid "Background" msgstr "Hintergrund" -#: ../src/interface.c:3921 +#: ../src/interface.c:3927 msgid "" "The background color of characters after the given cursor position (see " "below) changed to the color set below. (This is recommended if you use " @@ -2358,44 +2343,43 @@ "(siehe unten) stehen, wird auf die unten angegebene Farbe geändert (nützlich " "für proportionale Schriftarten)." -#: ../src/interface.c:3925 +#: ../src/interface.c:3931 msgid "Disabled" msgstr "Deaktiviert" -#: ../src/interface.c:3931 -#, fuzzy +#: ../src/interface.c:3937 msgid "<b>Long line marker</b>" -msgstr "<b>Markierung für statischen Zeilenumbruch</b>" +msgstr "<b>Umbruchhilfe für lange Zeilen</b>" -#: ../src/interface.c:3936 +#: ../src/interface.c:3942 msgid "Display" -msgstr "Anzeigen" +msgstr "Ansicht" -#: ../src/interface.c:3940 ../src/keybindings.c:204 +#: ../src/interface.c:3946 ../src/keybindings.c:204 msgid "Editor" msgstr "Editor" -#: ../src/interface.c:3972 +#: ../src/interface.c:3978 msgid "Sets the default encoding for newly created files." msgstr "Setzt die Zeichenkodierung für neu erstellte Dateien." -#: ../src/interface.c:3978 +#: ../src/interface.c:3984 msgid "Default encoding (new files):" msgstr "Standardzeichenkodierung (neue Dateien):" -#: ../src/interface.c:3985 +#: ../src/interface.c:3991 msgid "Default encoding (existing files):" msgstr "Standardzeichenkodierung (existierende Dateien):" -#: ../src/interface.c:3997 +#: ../src/interface.c:4003 msgid "Sets the default encoding for opening existing files." msgstr "Setzt die Standard-Zeichenkodierung für zu öffnende Dateien." -#: ../src/interface.c:4003 +#: ../src/interface.c:4009 msgid "Use fixed encoding when opening files" msgstr "Benutze feststehende Zeichenkodierung beim Öffnen neuer Dateien" -#: ../src/interface.c:4008 +#: ../src/interface.c:4014 msgid "" "This option disables the automatic detection of the file encoding when " "opening files and opens the file with the specified encoding (usually not " @@ -2404,53 +2388,52 @@ "Diese Option deaktiviert die automatische Erkennung der Zeichenkodierung und " "öffnet die ausgewählten Dateien mit der angegebenen Kodierung." -#: ../src/interface.c:4011 +#: ../src/interface.c:4017 msgid "Default end of line characters:" msgstr "Zeichen für das Standardzeilenende:" -#: ../src/interface.c:4024 +#: ../src/interface.c:4030 msgid "<b>New files</b>" msgstr "<b>Neue Dateien</b>" -#: ../src/interface.c:4043 +#: ../src/interface.c:4049 msgid "Ensure new line at file end" msgstr "Neue Zeile am Dateiende" -#: ../src/interface.c:4047 +#: ../src/interface.c:4053 msgid "Ensures that at the end of the file is a new line" msgstr "Fügt am Dateiende eine neue Zeile an, falls keine vorhanden ist." -#: ../src/interface.c:4050 -#, fuzzy +#: ../src/interface.c:4056 msgid "Strip trailing spaces and tabs" -msgstr "Leerzeichen am Zeilenende entfernen" +msgstr "Leerzeichen und Tabulatoren am Zeilenende entfernen" -#: ../src/interface.c:4054 +#: ../src/interface.c:4060 msgid "Removes trailing spaces and tabs and the end of lines" -msgstr "Entfernt Leerzeichen am Ende einer Zeile." +msgstr "Entfernt Leerzeichen und Tabulatoren am Ende einer Zeile." -#: ../src/interface.c:4057 ../src/keybindings.c:415 +#: ../src/interface.c:4063 ../src/keybindings.c:415 msgid "Replace tabs by space" msgstr "Tabulatoren durch Leerzeichen ersetzen" -#: ../src/interface.c:4064 +#: ../src/interface.c:4070 msgid "<b>Saving files</b>" msgstr "<b>Speichern</b>" -#: ../src/interface.c:4085 +#: ../src/interface.c:4091 msgid "Recent files list length:" msgstr "Anzahl der \"Zuletzt geöffneten\" Dateien" -#: ../src/interface.c:4099 +#: ../src/interface.c:4105 msgid "" "Specifies the number of files which are stored in the Recent files list." msgstr "Gibt die Länge der Liste von Dateien an, die zuletzt geöffnet wurden." -#: ../src/interface.c:4103 +#: ../src/interface.c:4109 msgid "Disk check timeout:" msgstr "Zeitinterval zum Prüfen auf Dateiänderungen:" -#: ../src/interface.c:4116 +#: ../src/interface.c:4122 msgid "" "How often to check for changes to document files on disk, in seconds. Zero " "disables checking." @@ -2458,15 +2441,15 @@ "Wie oft soll auf Veränderungen geprüft werden? Angabe in Sekunden. 0 " "deaktiviert die Funktion." -#: ../src/interface.c:4125 ../src/symbols.c:578 ../plugins/filebrowser.c:942 +#: ../src/interface.c:4131 ../src/symbols.c:578 ../plugins/filebrowser.c:943 msgid "Files" msgstr "Dateien" -#: ../src/interface.c:4143 +#: ../src/interface.c:4149 msgid "Always wrap search and hide the Find dialog" msgstr "Das vollständige Dokument durchsuchen und den Suchen-Dialog schließen" -#: ../src/interface.c:4147 +#: ../src/interface.c:4153 msgid "" "Always wrap search around the document and hide the Find dialog after " "clicking Find Next/Previous" @@ -2474,48 +2457,46 @@ "Durchsucht immer das vollständige Dokument und schließt den Suchen-Dialog " "nach Klicken auf »Nächstes« oder »Vorheriges«." -#: ../src/interface.c:4150 +#: ../src/interface.c:4156 msgid "Use the current word under the cursor for Find dialogs" msgstr "Aktuelle Cursorposition zur Suche heranziehen." -#: ../src/interface.c:4154 +#: ../src/interface.c:4160 msgid "" "Use current word under the cursor when opening the Find, Find in Files or " "Replace dialog and there is no selection." msgstr "" "Bestimmt das aktuelle Wort zum Suchen & Ersetzen anhand der Cursor-Position." -#: ../src/interface.c:4157 -#, fuzzy +#: ../src/interface.c:4163 msgid "Use the current file's directory for Find in Files" -msgstr "Aktuelle Cursorposition zur Suche heranziehen." +msgstr "Aktuelles Verzeichnis zur Suche heranziehen." -#: ../src/interface.c:4161 -#, fuzzy +#: ../src/interface.c:4167 msgid "<b>Search</b>" -msgstr "<b>Seitenleiste</b>" +msgstr "<b>Suche</b>" -#: ../src/interface.c:4166 ../src/keybindings.c:305 +#: ../src/interface.c:4172 ../src/keybindings.c:305 msgid "Search" msgstr "Suchen" -#: ../src/interface.c:4198 +#: ../src/interface.c:4204 msgid "Make:" msgstr "Make:" -#: ../src/interface.c:4205 +#: ../src/interface.c:4211 msgid "Terminal:" msgstr "Terminal:" -#: ../src/interface.c:4212 +#: ../src/interface.c:4218 msgid "Browser:" msgstr "Browser:" -#: ../src/interface.c:4224 +#: ../src/interface.c:4230 msgid "Path and options for the make tool" msgstr "Pfad und spezielle Optionen und / oder Targets für \"make\" angeben." -#: ../src/interface.c:4231 +#: ../src/interface.c:4237 msgid "" "A terminal emulator like xterm, gnome-terminal or konsole (should accept the " "-e argument)" @@ -2523,23 +2504,23 @@ "Eine Terminal-Emulation wie z.B. xterm, gnome-terminal oder konsole (sie " "sollte die Option -e akzeptieren)." -#: ../src/interface.c:4238 +#: ../src/interface.c:4244 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "Pfad und evtl. Argumente zum Starten eines Browsers" -#: ../src/interface.c:4270 +#: ../src/interface.c:4276 msgid "Grep:" msgstr "Grep:" -#: ../src/interface.c:4293 +#: ../src/interface.c:4299 msgid "<b>Tool paths</b>" msgstr "<b>Pfade zu den Werkzeugen</b>" -#: ../src/interface.c:4314 +#: ../src/interface.c:4320 msgid "Context action:" msgstr "Kontextaktion:" -#: ../src/interface.c:4325 +#: ../src/interface.c:4331 #, c-format msgid "" "Context action command. The currently selected word can be used with %s. It " @@ -2549,109 +2530,153 @@ "Der aktuell markierte Text kann mit %s angegeben werden. Es darf überall in " "der Kommandozeile vorkommen und wird vor dem Ausführen ersetzt." -#: ../src/interface.c:4338 +#: ../src/interface.c:4344 msgid "<b>Commands</b>" msgstr "<b>Befehle</b>" -#: ../src/interface.c:4343 ../src/keybindings.c:451 +#: ../src/interface.c:4349 ../src/keybindings.c:451 msgid "Tools" msgstr "Werkzeuge" -#: ../src/interface.c:4376 +#: ../src/interface.c:4382 msgid "email address of the developer" msgstr "E-Mail-Adresse des Entwicklers" -#: ../src/interface.c:4383 +#: ../src/interface.c:4389 msgid "Initials of the developer name" msgstr "Initialen des Entwicklernamens" -#: ../src/interface.c:4385 +#: ../src/interface.c:4391 msgid "Initial version:" msgstr "Anfangsversion:" -#: ../src/interface.c:4397 +#: ../src/interface.c:4403 msgid "Version number, which a new file initially has" msgstr "Versionsnummer, welche eine neue Datei zu Beginn hat" -#: ../src/interface.c:4404 +#: ../src/interface.c:4410 msgid "Company name" msgstr "Firmenname" -#: ../src/interface.c:4406 +#: ../src/interface.c:4412 msgid "Developer:" msgstr "Entwickler:" -#: ../src/interface.c:4413 +#: ../src/interface.c:4419 msgid "Company:" msgstr "Firma:" -#: ../src/interface.c:4420 +#: ../src/interface.c:4426 msgid "Mail address:" msgstr "Mail-Adresse:" -#: ../src/interface.c:4427 +#: ../src/interface.c:4433 msgid "Initials:" msgstr "Initialen:" -#: ../src/interface.c:4439 +#: ../src/interface.c:4445 msgid "The name of the developer" msgstr "Der Name des Entwicklers" -#: ../src/interface.c:4441 +#: ../src/interface.c:4447 +#, fuzzy +msgid "Year:" +msgstr "Seitenleiste:" + +#: ../src/interface.c:4454 +#, fuzzy +msgid "Date:" +msgstr "Make:" + +#: ../src/interface.c:4461 +msgid "Date & Time:" +msgstr "" + +#: ../src/interface.c:4473 +#, fuzzy +msgid "" +"Specify a format for the the {datetime} wildcard. You can use any conversion " +"specifiers which can be used with the ANSI C strftime function." +msgstr "" +"Geben Sie ein Datumsformat an, dass für jeden Seitenkopf benutzt wird. Dabei " +"können alle Platzhalter verwendet werden, die auch in ANSI C »strftime« zum " +"Einsatz kommen." + +#: ../src/interface.c:4480 +#, fuzzy +msgid "" +"Specify a format for the the {year} wildcard. You can use any conversion " +"specifiers which can be used with the ANSI C strftime function." +msgstr "" +"Geben Sie ein Datumsformat an, dass für jeden Seitenkopf benutzt wird. Dabei " +"können alle Platzhalter verwendet werden, die auch in ANSI C »strftime« zum " +"Einsatz kommen." + +#: ../src/interface.c:4487 +#, fuzzy +msgid "" +"Specify a format for the the {date} wildcard. You can use any conversion " +"specifiers which can be used with the ANSI C strftime function." +msgstr "" +"Geben Sie ein Datumsformat an, dass für jeden Seitenkopf benutzt wird. Dabei " +"können alle Platzhalter verwendet werden, die auch in ANSI C »strftime« zum " +"Einsatz kommen." + +#: ../src/interface.c:4489 msgid "<b>Template data</b>" msgstr "<b>Daten für Vorlagen:</b>" -#: ../src/interface.c:4446 +#: ../src/interface.c:4494 msgid "Templates" msgstr "Vorlagen" -#: ../src/interface.c:4484 +#: ../src/interface.c:4532 msgid "C_hange" msgstr "Ä_ndern" -#: ../src/interface.c:4488 +#: ../src/interface.c:4536 msgid "<b>Keyboard shortcuts</b>" msgstr "<b>Tastaturkürzel</b>" -#: ../src/interface.c:4493 +#: ../src/interface.c:4541 msgid "Keybindings" msgstr "Tastenkürzel" -#: ../src/interface.c:4515 +#: ../src/interface.c:4563 msgid "Command:" msgstr "Befehl:" -#: ../src/interface.c:4522 +#: ../src/interface.c:4570 #, c-format msgid "Path to the command for printing files (use %f for the filename)." msgstr "Pfad zum Druckbefehl (benutzen Sie %f für den Dateinamen)." -#: ../src/interface.c:4532 +#: ../src/interface.c:4580 msgid "Use an external command for printing" msgstr "Ein externes Programm zum Drucken benutzen" -#: ../src/interface.c:4553 ../src/printing.c:343 +#: ../src/interface.c:4601 ../src/printing.c:343 msgid "Print line numbers" msgstr "Drucke Zeilennummern" -#: ../src/interface.c:4556 ../src/printing.c:345 +#: ../src/interface.c:4604 ../src/printing.c:345 msgid "Add line numbers to the printed page." msgstr "Zeige Zeilennummern auf der gedruckten Seite" -#: ../src/interface.c:4559 ../src/printing.c:349 +#: ../src/interface.c:4607 ../src/printing.c:349 msgid "Print page numbers" msgstr "Drucke Seitenzahlen" -#: ../src/interface.c:4562 ../src/printing.c:351 +#: ../src/interface.c:4610 ../src/printing.c:351 msgid "" "Add page numbers at the bottom of each page. It takes 2 lines of the page." msgstr "Füge jeder Seite die Seitenzahlen hinzu. Es werden 2 Zeilen benutzt." -#: ../src/interface.c:4565 ../src/printing.c:355 +#: ../src/interface.c:4613 ../src/printing.c:355 msgid "Print page header" msgstr "Drucke Seitenkopf" -#: ../src/interface.c:4568 ../src/printing.c:357 +#: ../src/interface.c:4616 ../src/printing.c:357 msgid "" "Adds a little header to every page containing the page number, the filename " "and the current date(see below). It takes 3 lines of the page." @@ -2659,21 +2684,21 @@ "Fügt 3 Kopfzeilen am Anfang jeder Seite ein (beinhaltet die Seitenzahl, den " "Dateinamen sowie das Datum). Es werden 3 Zeilen benutzt." -#: ../src/interface.c:4586 ../src/printing.c:374 +#: ../src/interface.c:4634 ../src/printing.c:374 msgid "Use the basename of the printed file" msgstr "Basisnamen der aktuellen Datei benutzen" -#: ../src/interface.c:4589 ../src/printing.c:376 +#: ../src/interface.c:4637 ../src/printing.c:376 msgid "Print only the basename(without the path) of the printed file." msgstr "" "Nur den Basisdateinamen (ohne die Pfadangabe) der zu druckenden Datei " "verwenden." -#: ../src/interface.c:4596 ../src/printing.c:383 +#: ../src/interface.c:4644 ../src/printing.c:383 msgid "Date format:" msgstr "Datumsformat:" -#: ../src/interface.c:4603 ../src/printing.c:388 +#: ../src/interface.c:4651 ../src/printing.c:388 msgid "" "Specify a format for the date and time stamp which is added to the page " "header on each page. You can use any conversion specifiers which can be used " @@ -2683,11 +2708,11 @@ "können alle Platzhalter verwendet werden, die auch in ANSI C »strftime« zum " "Einsatz kommen." -#: ../src/interface.c:4606 +#: ../src/interface.c:4654 msgid "Use native GTK printing" msgstr "GTK-Druckunterstützung benutzen" -#: ../src/interface.c:4613 +#: ../src/interface.c:4661 msgid "Printing" msgstr "Drucken" @@ -2901,9 +2926,8 @@ msgstr "Datum einfügen" #: ../src/keybindings.c:297 -#, fuzzy msgid "Insert alternative white space" -msgstr "Alternative Leerzeichen einfügen" +msgstr "Alternatives Leerzeichen einfügen" #: ../src/keybindings.c:299 msgid "Settings" @@ -2942,9 +2966,8 @@ msgstr "Nächste Nachricht" #: ../src/keybindings.c:326 -#, fuzzy msgid "Previous Message" -msgstr "Nächste Nachricht" +msgstr "Vorherige Nachricht" #: ../src/keybindings.c:328 msgid "Find Usage" @@ -2979,14 +3002,12 @@ msgstr "Gehe zu Tag Deklaration" #: ../src/keybindings.c:355 -#, fuzzy msgid "Go to Start of Line" -msgstr "Gehe zu Zeile" +msgstr "Gehe zum Zeilenanfang" #: ../src/keybindings.c:357 -#, fuzzy msgid "Go to End of Line" -msgstr "Gehe zu Zeile" +msgstr "Gehe zum Zeilenende" #: ../src/keybindings.c:359 msgid "View" @@ -3041,9 +3062,8 @@ msgstr "Zur Seitenleiste wechseln" #: ../src/keybindings.c:389 -#, fuzzy msgid "Switch to Compiler" -msgstr "Zur Seitenleiste wechseln" +msgstr "Wechsle zum Compiler" #: ../src/keybindings.c:391 msgid "Notebook tab" @@ -3082,24 +3102,20 @@ msgstr "Dokument" #: ../src/keybindings.c:411 -#, fuzzy msgid "Toggle Line wrapping" -msgstr "Zeilenumbruch" +msgstr "Virt. Zeilenumbruch umschalten" #: ../src/keybindings.c:413 -#, fuzzy msgid "Toggle Line breaking" -msgstr "Kommentierung _umschalten" +msgstr "Harten Zeilenumbruch _umschalten" #: ../src/keybindings.c:417 -#, fuzzy msgid "Replace spaces by tabs" -msgstr "_Tabulatoren durch Leerzeichen ersetzen" +msgstr "Leerzeichen durch _Tabulatoren ersetzen" #: ../src/keybindings.c:419 -#, fuzzy msgid "Toggle current fold" -msgstr "Aktuelles Wort auswählen" +msgstr "Aktuelle Faltung umschalten" #: ../src/keybindings.c:421 msgid "Fold all" @@ -3134,9 +3150,8 @@ msgstr "Nächster Fehler" #: ../src/keybindings.c:443 -#, fuzzy msgid "Previous error" -msgstr "Ehemalige Übersetzer" +msgstr "Vorheriger Fehler" #: ../src/keybindings.c:445 msgid "Run" @@ -3166,12 +3181,12 @@ msgid "The following keyboard shortcuts are configurable:" msgstr "Die folgende Tastenkürzel sind frei definierbar: " -#: ../src/keyfile.c:753 +#: ../src/keyfile.c:759 msgid "Type here what you want, use it as a notice/scratch board" msgstr "" "Schreiben Sie hier rein, was sie möchten. Sie können es als Notizbuch nutzen." -#: ../src/keyfile.c:948 +#: ../src/keyfile.c:954 msgid "Failed to load one or more session files." msgstr "" "Eine oder mehre Datei(en) aus der letzten Sitzung konnte(n) nicht geladen " @@ -3283,9 +3298,8 @@ msgstr "Meldungen" #: ../src/msgwindow.c:492 -#, fuzzy msgid "Copy _All" -msgstr "_Alle schließen" +msgstr "_Alles kopieren" #: ../src/msgwindow.c:522 msgid "_Hide Message Window" @@ -3351,38 +3365,38 @@ msgid "Shortcut" msgstr "Tastenkürzel" -#: ../src/prefs.c:1159 +#: ../src/prefs.c:1180 msgid "Grab Key" msgstr "Tasten festlegen" -#: ../src/prefs.c:1165 +#: ../src/prefs.c:1186 #, c-format msgid "Type the combination of the keys you want to use for \"%s\"." msgstr "Drücken Sie die gewünschte Tastenkombination für \"%s\"." -#: ../src/prefs.c:1352 +#: ../src/prefs.c:1373 msgid "_Override" msgstr "_Ersetzen" -#: ../src/prefs.c:1353 +#: ../src/prefs.c:1374 msgid "Override that keybinding?" msgstr "Diese Tastenkombination ersetzen?" -#: ../src/prefs.c:1354 +#: ../src/prefs.c:1375 #, c-format msgid "The combination '%s' is already used for \"%s\"." msgstr "Die Tastenkombination '%s' wird bereits für \"%s\" verwendet." #. add manually GeanyWrapLabels because it can't be added with Glade #. * page Tools -#: ../src/prefs.c:1466 +#: ../src/prefs.c:1487 msgid "Enter tool paths below. Tools you do not need can be left blank." msgstr "" "Geben Sie hier die Pfade zu den einzelnen Werkzeugen an. Programme die nicht " "benötigt werden können freigelassen werden." #. page Templates -#: ../src/prefs.c:1471 +#: ../src/prefs.c:1492 msgid "" "Set the information to be used in templates. See the documentation for " "details." @@ -3392,16 +3406,18 @@ "Konsultieren Sie die Dokumentation, um mehr über die Arbeitsweise der " "Vorlagen zu erfahren." -#: ../src/prefs.c:1475 +#: ../src/prefs.c:1496 +#, fuzzy msgid "" "<i>Notice: For all changes you make here to take effect, you need to restart " -"Geany.</i>" +"Geany or force the reload of the settings using Tools->Reload Configuration." +"</i>" msgstr "" "<i>Damit die hier gemachten Änderungen an den Einstellungen wirksam werden, " "muss Geany neu gestartet werden.</i>" #. page Keybindings -#: ../src/prefs.c:1481 +#: ../src/prefs.c:1502 msgid "" "Here you can change keyboard shortcuts for various actions. Select one and " "press the Change button to enter a new shortcut, or double click on an " @@ -3413,7 +3429,7 @@ "die Tastenkombinationen auch direkt eingegeben werden." #. page Printing -#: ../src/prefs.c:1486 +#: ../src/prefs.c:1507 msgid "" "<i>Notice: Native GTK printing is only available if Geany was built against " "GTK 2.10 (or above) <b>and</b> Geany is running with GTK 2.10 (or above).</i>" @@ -3853,17 +3869,17 @@ #. &(tv_iters.tag_macro), _("Macros"), #. &(tv_iters.tag_variable), _("Variables"), #: ../src/symbols.c:590 ../src/symbols.c:619 ../src/symbols.c:724 -#: ../src/symbols.c:736 ../src/symbols.c:748 ../src/symbols.c:762 -#: ../src/symbols.c:806 +#: ../src/symbols.c:736 ../src/symbols.c:748 ../src/symbols.c:763 +#: ../src/symbols.c:807 msgid "Other" msgstr "Sonstiges" -#: ../src/symbols.c:597 ../src/symbols.c:755 ../src/symbols.c:787 +#: ../src/symbols.c:597 ../src/symbols.c:756 ../src/symbols.c:788 msgid "Module" msgstr "Modul" #: ../src/symbols.c:598 ../src/symbols.c:734 ../src/symbols.c:746 -#: ../src/symbols.c:760 ../src/symbols.c:772 +#: ../src/symbols.c:761 ../src/symbols.c:773 msgid "Types" msgstr "Typen" @@ -3873,7 +3889,7 @@ #: ../src/symbols.c:600 ../src/symbols.c:627 ../src/symbols.c:642 #: ../src/symbols.c:690 ../src/symbols.c:703 ../src/symbols.c:743 -#: ../src/symbols.c:757 ../src/symbols.c:794 +#: ../src/symbols.c:758 ../src/symbols.c:795 msgid "Functions" msgstr "Funktionen" @@ -3922,12 +3938,12 @@ msgstr "Our" #: ../src/symbols.c:640 ../src/symbols.c:718 ../src/symbols.c:731 -#: ../src/symbols.c:756 +#: ../src/symbols.c:757 msgid "Interfaces" msgstr "Interfaces" #: ../src/symbols.c:641 ../src/symbols.c:676 ../src/symbols.c:688 -#: ../src/symbols.c:719 ../src/symbols.c:732 ../src/symbols.c:793 +#: ../src/symbols.c:719 ../src/symbols.c:732 ../src/symbols.c:794 msgid "Classes" msgstr "Klassen" @@ -3939,8 +3955,8 @@ #. &(tv_iters.tag_member), _("Members"), #. &(tv_iters.tag_macro), _("Macros"), #: ../src/symbols.c:644 ../src/symbols.c:691 ../src/symbols.c:707 -#: ../src/symbols.c:735 ../src/symbols.c:744 ../src/symbols.c:759 -#: ../src/symbols.c:805 +#: ../src/symbols.c:735 ../src/symbols.c:744 ../src/symbols.c:760 +#: ../src/symbols.c:806 msgid "Variables" msgstr "Variablen" @@ -3977,55 +3993,55 @@ msgid "Methods" msgstr "Methoden" -#: ../src/symbols.c:721 ../src/symbols.c:795 +#: ../src/symbols.c:721 ../src/symbols.c:796 msgid "Members" msgstr "Instanzvariablen" -#: ../src/symbols.c:747 ../src/symbols.c:769 +#: ../src/symbols.c:747 ../src/symbols.c:770 msgid "Labels" msgstr "Label" -#: ../src/symbols.c:758 +#: ../src/symbols.c:759 msgid "Subroutines" msgstr "Subroutinen" -#: ../src/symbols.c:761 +#: ../src/symbols.c:762 msgid "Blocks" msgstr "Blöcke" -#: ../src/symbols.c:770 ../src/symbols.c:779 ../src/symbols.c:802 +#: ../src/symbols.c:771 ../src/symbols.c:780 ../src/symbols.c:803 msgid "Macros" msgstr "Makros" -#: ../src/symbols.c:771 +#: ../src/symbols.c:772 msgid "Defines" msgstr "Definitionen" -#: ../src/symbols.c:778 +#: ../src/symbols.c:779 msgid "Targets" msgstr "Targets" -#: ../src/symbols.c:790 +#: ../src/symbols.c:791 msgid "Namespaces" msgstr "Namensräume" -#: ../src/symbols.c:796 +#: ../src/symbols.c:797 msgid "Structs / Typedefs" msgstr "Structs / Typedefs" -#: ../src/symbols.c:1022 +#: ../src/symbols.c:1023 #, c-format msgid "Unknown filetype extension for \"%s\".\n" msgstr "Unbekannte Dateityperweiterung für \"%s\".\n" -#: ../src/symbols.c:1043 +#: ../src/symbols.c:1044 #, c-format msgid "Failed to create tags file, perhaps because no tags were found.\n" msgstr "" "Die Tag-Datei konnte nicht erstellt werden, möglicherweise konnten keinen " "Tags gefunden werden.\n" -#: ../src/symbols.c:1050 +#: ../src/symbols.c:1051 #, c-format msgid "" "Usage: %s -g <Tag File> <File list>\n" @@ -4034,7 +4050,7 @@ "Verwendung: %s -g <Tag-Datei> <Datei-Liste>\n" "\n" -#: ../src/symbols.c:1051 +#: ../src/symbols.c:1052 #, c-format msgid "" "Example:\n" @@ -4045,30 +4061,30 @@ "CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/" "gtk/gtk.h\n" -#: ../src/symbols.c:1065 +#: ../src/symbols.c:1066 msgid "Load Tags" msgstr "Tags laden" -#: ../src/symbols.c:1072 +#: ../src/symbols.c:1073 msgid "Geany tag files (*.tags)" msgstr "Geany Tag-Datei (*.tags)" -#: ../src/symbols.c:1091 +#: ../src/symbols.c:1092 #, c-format msgid "Loaded %s tags file '%s'." msgstr "%s Tag-Datei '%s' geladen." -#: ../src/symbols.c:1093 +#: ../src/symbols.c:1094 #, c-format msgid "Could not load tags file '%s'." msgstr "Konnte Tag-Datei '%s' nicht laden." -#: ../src/symbols.c:1223 +#: ../src/symbols.c:1224 #, c-format msgid "Forward declaration \"%s\" not found." msgstr "(Vorwärts-)Deklaration von \"%s\" nicht gefunden." -#: ../src/symbols.c:1225 +#: ../src/symbols.c:1226 #, c-format msgid "Definition of \"%s\" not found." msgstr "Definition von \"%s\" nicht gefunden." @@ -4160,7 +4176,7 @@ msgid "Show _Document List" msgstr "_Dokumentenliste anzeigen" -#: ../src/treeviews.c:406 ../src/treeviews.c:493 ../plugins/filebrowser.c:582 +#: ../src/treeviews.c:406 ../src/treeviews.c:493 ../plugins/filebrowser.c:583 msgid "H_ide Sidebar" msgstr "Seitenleiste _verstecken" @@ -4542,7 +4558,7 @@ msgid "Inserts HTML character entities like '&'." msgstr "Fügt HTML-Sonderzeichen wie \"&\" ein." -#: ../plugins/htmlchars.c:45 ../plugins/export.c:47 ../plugins/vcdiff.c:51 +#: ../plugins/htmlchars.c:45 ../plugins/export.c:47 ../plugins/vcdiff.c:53 #: ../plugins/filebrowser.c:52 ../plugins/autosave.c:43 msgid "The Geany developer team" msgstr "Das Geany-Entwickler-Team" @@ -4657,19 +4673,19 @@ msgid "As _LaTeX" msgstr "Als _LaTeX exportieren" -#: ../plugins/vcdiff.c:50 +#: ../plugins/vcdiff.c:52 msgid "Version Diff" msgstr "Version Diff" -#: ../plugins/vcdiff.c:50 +#: ../plugins/vcdiff.c:52 msgid "Creates a patch of a file against version control." msgstr "Erstellt einen Patch einer Datei gegen ein Versionskontrollsystem." -#: ../plugins/vcdiff.c:297 +#: ../plugins/vcdiff.c:299 msgid "Input conversion of the diff output failed." msgstr "Die Konvertierung in die diff-Ausgabe ist fehlgeschlagen." -#: ../plugins/vcdiff.c:340 +#: ../plugins/vcdiff.c:342 #, c-format msgid "" "%s exited with an error: \n" @@ -4678,49 +4694,49 @@ "%s endete mit einem Fehler: \n" "%s." -#: ../plugins/vcdiff.c:348 +#: ../plugins/vcdiff.c:350 msgid "No changes were made." msgstr "Es wurden keine Änderungen vorgenommen." #. if we don't have an exact error message, print at least the failing command -#: ../plugins/vcdiff.c:367 +#: ../plugins/vcdiff.c:369 #, c-format msgid "unknown error while trying to spawn a process for %s" msgstr "Unbekannter Fehler beim Versuch, den Prozess %s auszuführen." -#: ../plugins/vcdiff.c:370 +#: ../plugins/vcdiff.c:372 #, c-format msgid "An error occurred (%s)." msgstr "Ein Fehler ist aufgetreten (%s)." -#: ../plugins/vcdiff.c:500 +#: ../plugins/vcdiff.c:502 msgid "_Version Diff" msgstr "_Version Diff" #. Single file -#: ../plugins/vcdiff.c:510 +#: ../plugins/vcdiff.c:512 msgid "From Current _File" msgstr "Von der aktuellen _Datei" -#: ../plugins/vcdiff.c:513 +#: ../plugins/vcdiff.c:515 msgid "Make a diff from the current active file" msgstr "Erstellt ein diff für die aktuell aktive Datei." #. Directory -#: ../plugins/vcdiff.c:519 +#: ../plugins/vcdiff.c:521 msgid "From Current _Directory" msgstr "Vom aktuellen _Verzeichnis" -#: ../plugins/vcdiff.c:522 +#: ../plugins/vcdiff.c:524 msgid "Make a diff from the directory of the current active file" msgstr "Erstellt ein diff für das Verzeichnis einer aktuell aktiven Datei." #. Project -#: ../plugins/vcdiff.c:528 +#: ../plugins/vcdiff.c:530 msgid "From Current _Project" msgstr "Vom aktuellen _Projekt" -#: ../plugins/vcdiff.c:531 +#: ../plugins/vcdiff.c:533 msgid "Make a diff from the current project's base path" msgstr "Erstellt ein diff für das aktuell geöffnete Projekt." @@ -4732,68 +4748,68 @@ msgid "Adds a file browser tab to the sidebar." msgstr "Fügt einen Dateimanager in die Seitenleiste ein." -#: ../plugins/filebrowser.c:309 +#: ../plugins/filebrowser.c:310 msgid "Too many items selected!" msgstr "Zu viele Elemente ausgewählt!" -#: ../plugins/filebrowser.c:393 +#: ../plugins/filebrowser.c:394 #, c-format msgid "Could not execute configured external command '%s' (%s)." msgstr "Kann angegebenen externen Befehl '%s' nicht ausführen (%s)." -#: ../plugins/filebrowser.c:552 +#: ../plugins/filebrowser.c:553 msgid "Open _externally" msgstr "Mit _externer Anwendung öffnen" -#: ../plugins/filebrowser.c:562 +#: ../plugins/filebrowser.c:563 msgid "_Find in Files" msgstr "In _Dateien suchen" -#: ../plugins/filebrowser.c:573 +#: ../plugins/filebrowser.c:574 msgid "Show _Hidden Files" msgstr "V_ersteckte Dateien anzeigen" -#: ../plugins/filebrowser.c:749 +#: ../plugins/filebrowser.c:750 msgid "Up" msgstr "Aufwärts" -#: ../plugins/filebrowser.c:755 +#: ../plugins/filebrowser.c:756 msgid "Refresh" msgstr "Neu laden" -#: ../plugins/filebrowser.c:761 +#: ../plugins/filebrowser.c:762 msgid "Home" msgstr "Persönliches Verzeichnis" -#: ../plugins/filebrowser.c:767 +#: ../plugins/filebrowser.c:768 msgid "Set path from document" msgstr "Pfad des Dokumentes übernehmen" -#: ../plugins/filebrowser.c:775 +#: ../plugins/filebrowser.c:776 msgid "Clear the filter" msgstr "Filter löschen" -#: ../plugins/filebrowser.c:789 +#: ../plugins/filebrowser.c:790 msgid "Filter:" msgstr "Datei" -#: ../plugins/filebrowser.c:948 +#: ../plugins/filebrowser.c:949 msgid "Focus File List" msgstr "Dateiliste in den Vordergrund" -#: ../plugins/filebrowser.c:950 +#: ../plugins/filebrowser.c:951 msgid "Focus Path Entry" msgstr "Pfad in den Vordergrund" -#: ../plugins/filebrowser.c:985 ../plugins/autosave.c:150 +#: ../plugins/filebrowser.c:986 ../plugins/autosave.c:150 msgid "Plugin configuration directory could not be created." msgstr "Plugin-Konfigurationsverzeichnis konnte nicht erstellt werden." -#: ../plugins/filebrowser.c:1011 +#: ../plugins/filebrowser.c:1012 msgid "External open command:" msgstr "Externes öffnen Kommando:" -#: ../plugins/filebrowser.c:1020 +#: ../plugins/filebrowser.c:1021 #, c-format msgid "" "The command to execute when using \"Open with\". You can use %f and %d " @@ -4808,15 +4824,15 @@ "%d wird durch den Pfadnamen der ausgewählten Datei ersetzt (ohne den " "Dateinamen)." -#: ../plugins/filebrowser.c:1027 +#: ../plugins/filebrowser.c:1028 msgid "Show hidden files" msgstr "Versteckte Dateien anzeigen" -#: ../plugins/filebrowser.c:1033 +#: ../plugins/filebrowser.c:1034 msgid "Hide object files" msgstr "Objektdateien verbergen" -#: ../plugins/filebrowser.c:1037 +#: ../plugins/filebrowser.c:1038 msgid "" "Don't show generated object files in the file browser, this includes *.o, *." "obj. *.so, *.dll, *.a, *.lib" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2777] trunk
by eht16＠users.sourceforge.net 14 Jul '08

14 Jul '08

Revision: 2777 http://geany.svn.sourceforge.net/geany/?rev=2777&view=rev Author: eht16 Date: 2008-07-14 11:27:20 -0700 (Mon, 14 Jul 2008) Log Message: ----------- Split filetype Fortran into Fortran 77 and Fortran 90. Modified Paths: -------------- trunk/ChangeLog trunk/data/filetype_extensions.conf trunk/data/filetypes.fortran trunk/scintilla/KeyWords.cxx trunk/src/document.c trunk/src/editor.c trunk/src/filetypes.c trunk/src/filetypes.h trunk/src/highlighting.c trunk/src/msgwindow.c trunk/src/plugindata.h trunk/src/symbols.c trunk/src/templates.c trunk/tagmanager/fortran.c trunk/tagmanager/parsers.h Added Paths: ----------- trunk/data/filetypes.f77 Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-07-14 11:13:54 UTC (rev 2776) +++ trunk/ChangeLog 2008-07-14 18:27:20 UTC (rev 2777) @@ -1,3 +1,13 @@ +2008-07-14 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + +* data/filetype_extensions.conf, data/filetypes.f77, + data/filetypes.fortran, scintilla/KeyWords.cxx, src/document.c, + src/editor.c, src/filetypes.c, src/filetypes.h, src/highlighting.c, + src/msgwindow.c, src/plugindata.h, src/symbols.c, src/templates.c, + tagmanager/fortran.c, tagmanager/parsers.h: + Split filetype Fortran into Fortran 77 and Fortran 90. + + 2008-07-13 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * data/snippets.conf, doc/geany.html, doc/geany.txt, src/editor.c: Modified: trunk/data/filetype_extensions.conf =================================================================== --- trunk/data/filetype_extensions.conf 2008-07-14 11:13:54 UTC (rev 2776) +++ trunk/data/filetype_extensions.conf 2008-07-14 18:27:20 UTC (rev 2777) @@ -10,7 +10,8 @@ C#=*.cs;*.vala; CAML=*.ml;*.mli; D=*.d;*.di; -Fortran=*.f;*.for;*.ftn;*.f77;*.f90;*.f95; +F77=*.f;*.for;*.ftn;*.f77; +Fortran=*.f90;*.f95;*.f03; FreeBasic=*.bas;*.bi; Haskell=*.hs;*.lhs; Haxe=*.hx; Added: trunk/data/filetypes.f77 =================================================================== --- trunk/data/filetypes.f77 (rev 0) +++ trunk/data/filetypes.f77 2008-07-14 18:27:20 UTC (rev 2777) @@ -0,0 +1,59 @@ +# For complete documentation of this file, please see Geany's main documentation +[styling] +# foreground;background;bold;italic +default=0x000000;0xffffff;false;false +comment=0x808080;0xffffff;false;false +number=0x007f00;0xffffff;false;false +string=0xff901e;0xffffff;false;false +operator=0x301010;0xffffff;false;false +identifier=0x000000;0xffffff;false;false +string2=0x111199;0xffffff;true;false +word=0x7f0000;0xffffff;true;false +word2=0x000099;0xffffff;true;false +word3=0x3d670f;0xffffff;true;false +preprocessor=0x007f7f;0xffffff;false;false +operator2=0x301010;0xffffff;true;false +continuation=0x000000;0xffffff;false;false +#continuation=0xff901e;0xf0e080;false;false +stringeol=0x000000;0xe0c0e0;false;false +label=0xa861a8;0xffffff;true;false + + +[keywords] +# all items must be in one line +primary=access action advance allocatable allocate apostrophe assign assignment associate asynchronous backspace bind blank blockdata call case character class close common complex contains continue cycle data deallocate decimal delim default dimension direct do dowhile double doubleprecision else elseif elsewhere encoding end endassociate endblockdata enddo endfile endforall endfunction endif endinterface endmodule endprogram endselect endsubroutine endtype endwhere entry eor equivalence err errmsg exist exit external file flush fmt form format formatted function go goto id if implicit in include inout integer inquire intent interface intrinsic iomsg iolength iostat kind len logical module name named namelist nextrec nml none nullify number only open opened operator optional out pad parameter pass pause pending pointer pos position precision print private program protected public quote read readwrite real rec recl recursive result return rewind save select selectcase selecttype sequential sign size stat status stop stream subroutine target then to type unformatted unit use value volatile wait where while write +intrinsic_functions=abs achar acos acosd adjustl adjustr aimag aimax0 aimin0 aint ajmax0 ajmin0 akmax0 akmin0 all allocated alog alog10 amax0 amax1 amin0 amin1 amod anint any asin asind associated atan atan2 atan2d atand bitest bitl bitlr bitrl bjtest bit_size bktest break btest cabs ccos cdabs cdcos cdexp cdlog cdsin cdsqrt ceiling cexp char clog cmplx conjg cos cosd cosh count cpu_time cshift csin csqrt dabs dacos dacosd dasin dasind datan datan2 datan2d datand date date_and_time dble dcmplx dconjg dcos dcosd dcosh dcotan ddim dexp dfloat dflotk dfloti dflotj digits dim dimag dint dlog dlog10 dmax1 dmin1 dmod dnint dot_product dprod dreal dsign dsin dsind dsinh dsqrt dtan dtand dtanh eoshift epsilon errsns exp exponent float floati floatj floatk floor fraction free huge iabs iachar iand ibclr ibits ibset ichar idate idim idint idnint ieor ifix iiabs iiand iibclr iibits iibset iidim iidint iidnnt iieor iifix iint iior iiqint iiqnnt iishft iishftc iisign ilen imax0 imax1 imin0 imin1 imod index inint inot int int1 int2 int4 int8 iqint iqnint ior ishft ishftc isign isnan izext jiand jibclr jibits jibset jidim jidint jidnnt jieor jifix jint jior jiqint jiqnnt jishft jishftc jisign jmax0 jmax1 jmin0 jmin1 jmod jnint jnot jzext kiabs kiand kibclr kibits kibset kidim kidint kidnnt kieor kifix kind kint kior kishft kishftc kisign kmax0 kmax1 kmin0 kmin1 kmod knint knot kzext lbound leadz len len_trim lenlge lge lgt lle llt log log10 logical lshift malloc matmul max max0 max1 maxexponent maxloc maxval merge min min0 min1 minexponent minloc minval mod modulo mvbits nearest nint not nworkers number_of_processors pack popcnt poppar precision present product radix random random_number random_seed range real repeat reshape rrspacing rshift scale scan secnds selected_int_kind selected_real_kind set_exponent shape sign sin sind sinh size sizeof sngl snglq spacing spread sqrt sum system_clock tan tand tanh tiny transfer transpose trim ubound unpack verify +user_functions=cdabs cdcos cdexp cdlog cdsin cdsqrt cotan cotand dcmplx dconjg dcotan dcotand decode dimag dll_export dll_import doublecomplex dreal dvchk encode find flen flush getarg getcharqq getcl getdat getenv gettim hfix ibchng identifier imag int1 int2 int4 intc intrup invalop iostat_msg isha ishc ishl jfix lacfar locking locnear map nargs nbreak ndperr ndpexc offset ovefl peekcharqq precfill prompt qabs qacos qacosd qasin qasind qatan qatand qatan2 qcmplx qconjg qcos qcosd qcosh qdim qexp qext qextd qfloat qimag qlog qlog10 qmax1 qmin1 qmod qreal qsign qsin qsind qsinh qsqrt qtan qtand qtanh ran rand randu rewrite segment setdat settim system timer undfl unlock union val virtual volatile zabs zcos zexp zlog zsin zsqrt + + +[settings] +# default extension used when saving files +#extension=f + +# the following characters are these which a "word" can contains, see documentation +#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 + +# if only single comment char is supported like # in this file, leave comment_close blank +comment_open=c +comment_close= + +# set to false if a comment character/string should start at column 0 of a line, true uses any +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d + #command_example(); +# setting to false would generate this +# command_example(); +# This setting works only for single line comments +comment_use_indent=false + +# context action command (please see Geany's main documentation for details) +context_action_cmd= + + +[build_settings] +# %f will be replaced by the complete filename +# %e will be replaced by the filename without extension +# (use only one of it at one time) +compiler=gfortran -Wall -c "%f" +linker=gfortran -Wall -o "%e" "%f" +run_cmd="./%e" + Property changes on: trunk/data/filetypes.f77 ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Modified: trunk/data/filetypes.fortran =================================================================== --- trunk/data/filetypes.fortran 2008-07-14 11:13:54 UTC (rev 2776) +++ trunk/data/filetypes.fortran 2008-07-14 18:27:20 UTC (rev 2777) @@ -28,7 +28,7 @@ [settings] # default extension used when saving files -#extension=f +#extension=f90 # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 @@ -53,7 +53,7 @@ # %f will be replaced by the complete filename # %e will be replaced by the filename without extension # (use only one of it at one time) -compiler=g77 -Wall -c "%f" -linker=g77 -Wall -o "%e" "%f" +compiler=gfortran -Wall -c "%f" +linker=gfortran -Wall -o "%e" "%f" run_cmd="./%e" Modified: trunk/scintilla/KeyWords.cxx =================================================================== --- trunk/scintilla/KeyWords.cxx 2008-07-14 11:13:54 UTC (rev 2776) +++ trunk/scintilla/KeyWords.cxx 2008-07-14 18:27:20 UTC (rev 2777) @@ -153,6 +153,7 @@ LINK_LEXER(lmD); LINK_LEXER(lmDiff); LINK_LEXER(lmErrorList); + LINK_LEXER(lmF77); LINK_LEXER(lmFortran); LINK_LEXER(lmHaskell); LINK_LEXER(lmHTML); Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2008-07-14 11:13:54 UTC (rev 2776) +++ trunk/src/document.c 2008-07-14 18:27:20 UTC (rev 2777) @@ -918,6 +918,9 @@ /* force using tabs for indentation for Makefiles */ if (FILETYPE_ID(doc->file_type) == GEANY_FILETYPES_MAKE) editor_set_use_tabs(doc, TRUE); + /* force using spaces for indentation for Fortran 77 */ + else if (FILETYPE_ID(doc->file_type) == GEANY_FILETYPES_F77) + editor_set_use_tabs(doc, FALSE); else if (! editor_prefs.detect_tab_mode) editor_set_use_tabs(doc, editor_prefs.use_tabs); else Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2008-07-14 11:13:54 UTC (rev 2776) +++ trunk/src/editor.c 2008-07-14 18:27:20 UTC (rev 2777) @@ -2495,6 +2495,7 @@ break; } case SCLEX_F77: + case SCLEX_FORTRAN: { if (style == SCE_F_COMMENT || style == SCE_F_STRING1 || Modified: trunk/src/filetypes.c =================================================================== --- trunk/src/filetypes.c 2008-07-14 11:13:54 UTC (rev 2776) +++ trunk/src/filetypes.c 2008-07-14 18:27:20 UTC (rev 2777) @@ -138,13 +138,21 @@ #define FORTRAN filetypes[GEANY_FILETYPES_FORTRAN]->lang = 18; filetypes[GEANY_FILETYPES_FORTRAN]->name = g_strdup("Fortran"); - filetypes[GEANY_FILETYPES_FORTRAN]->title = g_strdup_printf(_("%s source file"), "Fortran (F77)"); - filetypes[GEANY_FILETYPES_FORTRAN]->extension = g_strdup("f"); - filetypes[GEANY_FILETYPES_FORTRAN]->pattern = utils_strv_new("*.f", "*.for", "*.ftn", "*.f77", - "*.f90", "*.f95", NULL); + filetypes[GEANY_FILETYPES_FORTRAN]->title = g_strdup_printf(_("%s source file"), "Fortran (F90)"); + filetypes[GEANY_FILETYPES_FORTRAN]->extension = g_strdup("f90"); + filetypes[GEANY_FILETYPES_FORTRAN]->pattern = utils_strv_new("*.f90", "*.f95", "*.f03", NULL); filetypes[GEANY_FILETYPES_FORTRAN]->comment_open = g_strdup("c"); filetypes[GEANY_FILETYPES_FORTRAN]->comment_close = NULL; +#define F77 + filetypes[GEANY_FILETYPES_F77]->lang = 30; + filetypes[GEANY_FILETYPES_F77]->name = g_strdup("F77"); + filetypes[GEANY_FILETYPES_F77]->title = g_strdup_printf(_("%s source file"), "Fortran (F77)"); + filetypes[GEANY_FILETYPES_F77]->extension = g_strdup("f"); + filetypes[GEANY_FILETYPES_F77]->pattern = utils_strv_new("*.f", "*.for", "*.ftn", "*.f77", NULL); + filetypes[GEANY_FILETYPES_F77]->comment_open = g_strdup("c"); + filetypes[GEANY_FILETYPES_F77]->comment_close = NULL; + #define CAML filetypes[GEANY_FILETYPES_CAML]->lang = -2; filetypes[GEANY_FILETYPES_CAML]->name = g_strdup("CAML"); Modified: trunk/src/filetypes.h =================================================================== --- trunk/src/filetypes.h 2008-07-14 11:13:54 UTC (rev 2776) +++ trunk/src/filetypes.h 2008-07-14 18:27:20 UTC (rev 2777) @@ -40,6 +40,7 @@ GEANY_FILETYPES_CS, GEANY_FILETYPES_CAML, GEANY_FILETYPES_D, + GEANY_FILETYPES_F77, GEANY_FILETYPES_FORTRAN, GEANY_FILETYPES_BASIC, /* FreeBasic */ GEANY_FILETYPES_HASKELL, Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2008-07-14 11:13:54 UTC (rev 2776) +++ trunk/src/highlighting.c 2008-07-14 18:27:20 UTC (rev 2777) @@ -1989,6 +1989,67 @@ } +static void styleset_f77_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) +{ + new_style_array(GEANY_FILETYPES_F77, 15); + get_keyfile_hex(config, config_home, "styling", "default", "0x000000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_F77].styling[0]); + get_keyfile_hex(config, config_home, "styling", "comment", "0x808080", "0xffffff", "false", &style_sets[GEANY_FILETYPES_F77].styling[1]); + get_keyfile_hex(config, config_home, "styling", "number", "0x007f00", "0xffffff", "false", &style_sets[GEANY_FILETYPES_F77].styling[2]); + get_keyfile_hex(config, config_home, "styling", "string", "0xff901e", "0xffffff", "false", &style_sets[GEANY_FILETYPES_F77].styling[3]); + get_keyfile_hex(config, config_home, "styling", "operator", "0x301010", "0xffffff", "false", &style_sets[GEANY_FILETYPES_F77].styling[4]); + get_keyfile_hex(config, config_home, "styling", "identifier", "0x000000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_F77].styling[5]); + get_keyfile_hex(config, config_home, "styling", "string2", "0x111199", "0xffffff", "true", &style_sets[GEANY_FILETYPES_F77].styling[6]); + get_keyfile_hex(config, config_home, "styling", "word", "0x7f0000", "0xffffff", "true", &style_sets[GEANY_FILETYPES_F77].styling[7]); + get_keyfile_hex(config, config_home, "styling", "word2", "0x000099", "0xffffff", "true", &style_sets[GEANY_FILETYPES_F77].styling[8]); + get_keyfile_hex(config, config_home, "styling", "word3", "0x3d670f", "0xffffff", "true", &style_sets[GEANY_FILETYPES_F77].styling[9]); + get_keyfile_hex(config, config_home, "styling", "preprocessor", "0x007f7f", "0xffffff", "false", &style_sets[GEANY_FILETYPES_F77].styling[10]); + get_keyfile_hex(config, config_home, "styling", "operator2", "0x301010", "0xffffff", "true", &style_sets[GEANY_FILETYPES_F77].styling[11]); + get_keyfile_hex(config, config_home, "styling", "continuation", "0x000000", "0xf0e080", "false", &style_sets[GEANY_FILETYPES_F77].styling[12]); + get_keyfile_hex(config, config_home, "styling", "stringeol", "0x000000", "0xe0c0e0", "false", &style_sets[GEANY_FILETYPES_F77].styling[13]); + get_keyfile_hex(config, config_home, "styling", "label", "0xa861a8", "0xffffff", "true", &style_sets[GEANY_FILETYPES_F77].styling[14]); + + style_sets[GEANY_FILETYPES_F77].keywords = g_new(gchar*, 4); + get_keyfile_keywords(config, config_home, "keywords", "primary", GEANY_FILETYPES_F77, 0, ""); + get_keyfile_keywords(config, config_home, "keywords", "intrinsic_functions", GEANY_FILETYPES_F77, 1, ""); + get_keyfile_keywords(config, config_home, "keywords", "user_functions", GEANY_FILETYPES_F77, 2, ""); + style_sets[GEANY_FILETYPES_F77].keywords[3] = NULL; + + get_keyfile_wordchars(config, config_home, + &style_sets[GEANY_FILETYPES_F77].wordchars); +} + + +static void styleset_f77(ScintillaObject *sci) +{ + const filetype_id ft_id = GEANY_FILETYPES_F77; + + styleset_common(sci, 5, ft_id); + + apply_filetype_properties(sci, SCLEX_F77, ft_id); + + SSM(sci, SCI_SETKEYWORDS, 0, (sptr_t) style_sets[GEANY_FILETYPES_F77].keywords[0]); + SSM(sci, SCI_SETKEYWORDS, 1, (sptr_t) style_sets[GEANY_FILETYPES_F77].keywords[1]); + SSM(sci, SCI_SETKEYWORDS, 2, (sptr_t) style_sets[GEANY_FILETYPES_F77].keywords[2]); + + set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_F77, 0); + set_sci_style(sci, SCE_F_DEFAULT, GEANY_FILETYPES_F77, 0); + set_sci_style(sci, SCE_F_COMMENT, GEANY_FILETYPES_F77, 1); + set_sci_style(sci, SCE_F_NUMBER, GEANY_FILETYPES_F77, 2); + set_sci_style(sci, SCE_F_STRING1, GEANY_FILETYPES_F77, 3); + set_sci_style(sci, SCE_F_OPERATOR, GEANY_FILETYPES_F77, 4); + set_sci_style(sci, SCE_F_IDENTIFIER, GEANY_FILETYPES_F77, 5); + set_sci_style(sci, SCE_F_STRING2, GEANY_FILETYPES_F77, 6); + set_sci_style(sci, SCE_F_WORD, GEANY_FILETYPES_F77, 7); + set_sci_style(sci, SCE_F_WORD2, GEANY_FILETYPES_F77, 8); + set_sci_style(sci, SCE_F_WORD3, GEANY_FILETYPES_F77, 9); + set_sci_style(sci, SCE_F_PREPROCESSOR, GEANY_FILETYPES_F77, 10); + set_sci_style(sci, SCE_F_OPERATOR2, GEANY_FILETYPES_F77, 11); + set_sci_style(sci, SCE_F_CONTINUATION, GEANY_FILETYPES_F77, 12); + set_sci_style(sci, SCE_F_STRINGEOL, GEANY_FILETYPES_F77, 13); + set_sci_style(sci, SCE_F_LABEL, GEANY_FILETYPES_F77, 14); +} + + static void styleset_fortran_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { new_style_array(GEANY_FILETYPES_FORTRAN, 15); @@ -2025,7 +2086,7 @@ styleset_common(sci, 5, ft_id); - apply_filetype_properties(sci, SCLEX_F77, ft_id); /* SCLEX_FORTRAN */ + apply_filetype_properties(sci, SCLEX_FORTRAN, ft_id); SSM(sci, SCI_SETKEYWORDS, 0, (sptr_t) style_sets[GEANY_FILETYPES_FORTRAN].keywords[0]); SSM(sci, SCI_SETKEYWORDS, 1, (sptr_t) style_sets[GEANY_FILETYPES_FORTRAN].keywords[1]); @@ -2890,6 +2951,7 @@ init_styleset_case(GEANY_FILETYPES_DIFF, diff); init_styleset_case(GEANY_FILETYPES_DOCBOOK, docbook); init_styleset_case(GEANY_FILETYPES_FERITE, ferite); + init_styleset_case(GEANY_FILETYPES_F77, f77); init_styleset_case(GEANY_FILETYPES_FORTRAN, fortran); init_styleset_case(GEANY_FILETYPES_HASKELL, haskell); init_styleset_case(GEANY_FILETYPES_HAXE, haxe); @@ -2942,6 +3004,7 @@ styleset_case(GEANY_FILETYPES_DIFF, diff); styleset_case(GEANY_FILETYPES_DOCBOOK, docbook); styleset_case(GEANY_FILETYPES_FERITE, ferite); + styleset_case(GEANY_FILETYPES_F77, f77); styleset_case(GEANY_FILETYPES_FORTRAN, fortran); styleset_case(GEANY_FILETYPES_HASKELL, haskell); styleset_case(GEANY_FILETYPES_HAXE, haxe); Modified: trunk/src/msgwindow.c =================================================================== --- trunk/src/msgwindow.c 2008-07-14 11:13:54 UTC (rev 2776) +++ trunk/src/msgwindow.c 2008-07-14 18:27:20 UTC (rev 2777) @@ -816,6 +816,7 @@ * empty.h:4: Warnung: type defaults to `int' in declaration of `foo' * empty.c:21: error: conflicting types for `foo' * Only parse file and line, so that linker errors will also work (with -g) */ + case GEANY_FILETYPES_F77: case GEANY_FILETYPES_FORTRAN: case GEANY_FILETYPES_LATEX: /* ./kommtechnik_2b.tex:18: Emergency stop. */ Modified: trunk/src/plugindata.h =================================================================== --- trunk/src/plugindata.h 2008-07-14 11:13:54 UTC (rev 2776) +++ trunk/src/plugindata.h 2008-07-14 18:27:20 UTC (rev 2777) @@ -36,12 +36,12 @@ /* The API version should be incremented whenever any plugin data types below are * modified or appended to. */ -static const gint api_version = 76; +static const gint api_version = 77; /* The ABI version should be incremented whenever existing fields in the plugin * data types below have to be changed or reordered. It should stay the same if fields * are only appended, as this doesn't affect existing fields. */ -static const gint abi_version = 40; +static const gint abi_version = 41; /** Check the plugin can be loaded by Geany. * This performs runtime checks that try to ensure: Modified: trunk/src/symbols.c =================================================================== --- trunk/src/symbols.c 2008-07-14 11:13:54 UTC (rev 2776) +++ trunk/src/symbols.c 2008-07-14 18:27:20 UTC (rev 2777) @@ -749,10 +749,11 @@ NULL); break; } + case GEANY_FILETYPES_F77: case GEANY_FILETYPES_FORTRAN: { tag_list_add_groups(tag_store, - &(tv_iters.tag_namespace), _("Module"), NULL, + &(tv_iters.tag_namespace), _("Module"), "classviewer-class", &(tv_iters.tag_struct), _("Interfaces"), "classviewer-struct", &(tv_iters.tag_function), _("Functions"), "classviewer-method", &(tv_iters.tag_member), _("Subroutines"), "classviewer-method", Modified: trunk/src/templates.c =================================================================== --- trunk/src/templates.c 2008-07-14 11:13:54 UTC (rev 2776) +++ trunk/src/templates.c 2008-07-14 18:27:20 UTC (rev 2777) @@ -563,6 +563,7 @@ break; } + case GEANY_FILETYPES_F77: case GEANY_FILETYPES_FORTRAN: { line_prefix = "c"; Modified: trunk/tagmanager/fortran.c =================================================================== --- trunk/tagmanager/fortran.c 2008-07-14 11:13:54 UTC (rev 2776) +++ trunk/tagmanager/fortran.c 2008-07-14 18:27:20 UTC (rev 2777) @@ -162,6 +162,7 @@ */ static langType Lang_fortran; +static langType Lang_f77; static jmp_buf Exception; static int Ungetc = '\0'; static unsigned int Column = 0; @@ -304,7 +305,7 @@ Ancestors.max = 0; } -static void buildFortranKeywordHash (void) +static void buildFortranKeywordHash (const langType language) { const size_t count = sizeof (FortranKeywordTable) / sizeof (FortranKeywordTable [0]); @@ -312,7 +313,7 @@ for (i = 0 ; i < count ; ++i) { const keywordDesc* const p = &FortranKeywordTable [i]; - addKeyword (p->name, Lang_fortran, (int) p->id); + addKeyword (p->name, language, (int) p->id); } } @@ -750,7 +751,7 @@ if (keyword == NULL) keyword = vStringNew (); vStringCopyToLower (keyword, name); - id = (keywordId) lookupKeyword (vStringValue (keyword), Lang_fortran); + id = (keywordId) lookupKeyword (vStringValue (keyword), getSourceLanguage()); return id; } @@ -1655,18 +1656,24 @@ return retry; } -static void initialize (const langType language) +static void initializeFortran (const langType language) { Lang_fortran = language; - buildFortranKeywordHash (); + buildFortranKeywordHash (language); } +static void initializeF77 (const langType language) +{ + Lang_f77 = language; + buildFortranKeywordHash (language); +} + extern parserDefinition* FortranParser (void) { static const char *const extensions [] = { - "f", "for", "ftn", "f77", "f90", "f95", + "f90", "f95", "f03", #ifndef CASE_INSENSITIVE_FILENAMES - "F", "FOR", "FTN", "F77", "F90", "F95", + "F90", "F95", "F03", #endif NULL }; @@ -1675,8 +1682,26 @@ def->kindCount = KIND_COUNT (FortranKinds); def->extensions = extensions; def->parser2 = findFortranTags; - def->initialize = initialize; + def->initialize = initializeFortran; return def; } +extern parserDefinition* F77Parser (void) +{ + static const char *const extensions [] = { + "f", "for", "ftn", "f77", +#ifndef CASE_INSENSITIVE_FILENAMES + "F", "FOR", "FTN", "F77", +#endif + NULL + }; + parserDefinition* def = parserNew ("F77"); + def->kinds = FortranKinds; + def->kindCount = KIND_COUNT (FortranKinds); + def->extensions = extensions; + def->parser2 = findFortranTags; + def->initialize = initializeF77; + return def; +} + /* vi:set tabstop=8 shiftwidth=4: */ Modified: trunk/tagmanager/parsers.h =================================================================== --- trunk/tagmanager/parsers.h 2008-07-14 11:13:54 UTC (rev 2776) +++ trunk/tagmanager/parsers.h 2008-07-14 18:27:20 UTC (rev 2777) @@ -44,7 +44,8 @@ FreeBasicParser,\ HaxeParser,\ RestParser, \ - HtmlParser + HtmlParser, \ + F77Parser /* langType of each parser @@ -78,6 +79,7 @@ 27 HaxeParser 28 RestParser 29 HtmlParser +30 F77Parser */ #endif /* _PARSERS_H */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2776] branches/editor-struct
by ntrel＠users.sourceforge.net 14 Jul '08

14 Jul '08

Revision: 2776 http://geany.svn.sourceforge.net/geany/?rev=2776&view=rev Author: ntrel Date: 2008-07-14 04:13:54 -0700 (Mon, 14 Jul 2008) Log Message: ----------- Rename GeanyEditor::scintilla to GeanyEditor::sci. Modified Paths: -------------- branches/editor-struct/ChangeLog branches/editor-struct/plugins/classbuilder.c branches/editor-struct/plugins/export.c branches/editor-struct/plugins/htmlchars.c branches/editor-struct/plugins/vcdiff.c branches/editor-struct/src/callbacks.c branches/editor-struct/src/document.c branches/editor-struct/src/editor.c branches/editor-struct/src/editor.h branches/editor-struct/src/filetypes.c branches/editor-struct/src/keybindings.c branches/editor-struct/src/keyfile.c branches/editor-struct/src/main.c branches/editor-struct/src/navqueue.c branches/editor-struct/src/notebook.c branches/editor-struct/src/printing.c branches/editor-struct/src/search.c branches/editor-struct/src/symbols.c branches/editor-struct/src/tools.c branches/editor-struct/src/treeviews.c branches/editor-struct/src/ui_utils.c Modified: branches/editor-struct/ChangeLog =================================================================== --- branches/editor-struct/ChangeLog 2008-07-13 11:51:00 UTC (rev 2775) +++ branches/editor-struct/ChangeLog 2008-07-14 11:13:54 UTC (rev 2776) @@ -1,3 +1,14 @@ +2008-07-14 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/keybindings.c, src/printing.c, src/tools.c, src/navqueue.c, + src/treeviews.c, src/callbacks.c, src/notebook.c, src/keyfile.c, + src/filetypes.c, src/search.c, src/document.c, src/main.c, + src/editor.c, src/symbols.c, src/editor.h, src/ui_utils.c, + plugins/export.c, plugins/vcdiff.c, plugins/htmlchars.c, + plugins/classbuilder.c: + Rename GeanyEditor::scintilla to GeanyEditor::sci. + + 2008-07-11 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * src/document.c, src/editor.c, src/editor.h, src/ui_utils.c: Modified: branches/editor-struct/plugins/classbuilder.c =================================================================== --- branches/editor-struct/plugins/classbuilder.c 2008-07-13 11:51:00 UTC (rev 2775) +++ branches/editor-struct/plugins/classbuilder.c 2008-07-14 11:13:54 UTC (rev 2776) @@ -733,7 +733,7 @@ { text = get_template_class_source(class_info); doc = p_document->new_file(class_info->source, NULL, NULL); - p_sci->set_text(doc->editor->scintilla, text); + p_sci->set_text(doc->editor->sci, text); g_free(text); } @@ -741,7 +741,7 @@ { text = get_template_class_header(class_info); doc = p_document->new_file(class_info->header, NULL, NULL); - p_sci->set_text(doc->editor->scintilla, text); + p_sci->set_text(doc->editor->sci, text); g_free(text); } Modified: branches/editor-struct/plugins/export.c =================================================================== --- branches/editor-struct/plugins/export.c 2008-07-13 11:51:00 UTC (rev 2775) +++ branches/editor-struct/plugins/export.c 2008-07-14 11:13:54 UTC (rev 2776) @@ -357,25 +357,25 @@ GString *body; GString *cmds; GString *latex; - gint style_max = pow(2, p_sci->send_message(doc->editor->scintilla, SCI_GETSTYLEBITS, 0, 0)); + gint style_max = pow(2, p_sci->send_message(doc->editor->sci, SCI_GETSTYLEBITS, 0, 0)); /* first read all styles from Scintilla */ for (i = 0; i < style_max; i++) { - styles[i][FORE] = p_sci->send_message(doc->editor->scintilla, SCI_STYLEGETFORE, i, 0); - styles[i][BACK] = p_sci->send_message(doc->editor->scintilla, SCI_STYLEGETBACK, i, 0); - styles[i][BOLD] = p_sci->send_message(doc->editor->scintilla, SCI_STYLEGETBOLD, i, 0); - styles[i][ITALIC] = p_sci->send_message(doc->editor->scintilla, SCI_STYLEGETITALIC, i, 0); + styles[i][FORE] = p_sci->send_message(doc->editor->sci, SCI_STYLEGETFORE, i, 0); + styles[i][BACK] = p_sci->send_message(doc->editor->sci, SCI_STYLEGETBACK, i, 0); + styles[i][BOLD] = p_sci->send_message(doc->editor->sci, SCI_STYLEGETBOLD, i, 0); + styles[i][ITALIC] = p_sci->send_message(doc->editor->sci, SCI_STYLEGETITALIC, i, 0); styles[i][USED] = 0; } /* read the document and write the LaTeX code */ body = g_string_new(""); - for (i = 0; i < p_sci->get_length(doc->editor->scintilla); i++) + for (i = 0; i < p_sci->get_length(doc->editor->sci); i++) { - style = p_sci->get_style_at(doc->editor->scintilla, i); - c = p_sci->get_char_at(doc->editor->scintilla, i); - c_next = p_sci->get_char_at(doc->editor->scintilla, i + 1); + style = p_sci->get_style_at(doc->editor->sci, i); + c = p_sci->get_char_at(doc->editor->sci, i); + c_next = p_sci->get_char_at(doc->editor->sci, i + 1); if (style != old_style || ! block_open) { @@ -564,15 +564,15 @@ GString *body; GString *css; GString *html; - gint style_max = pow(2, p_sci->send_message(doc->editor->scintilla, SCI_GETSTYLEBITS, 0, 0)); + gint style_max = pow(2, p_sci->send_message(doc->editor->sci, SCI_GETSTYLEBITS, 0, 0)); /* first read all styles from Scintilla */ for (i = 0; i < style_max; i++) { - styles[i][FORE] = ROTATE_RGB(p_sci->send_message(doc->editor->scintilla, SCI_STYLEGETFORE, i, 0)); - styles[i][BACK] = ROTATE_RGB(p_sci->send_message(doc->editor->scintilla, SCI_STYLEGETBACK, i, 0)); - styles[i][BOLD] = p_sci->send_message(doc->editor->scintilla, SCI_STYLEGETBOLD, i, 0); - styles[i][ITALIC] = p_sci->send_message(doc->editor->scintilla, SCI_STYLEGETITALIC, i, 0); + styles[i][FORE] = ROTATE_RGB(p_sci->send_message(doc->editor->sci, SCI_STYLEGETFORE, i, 0)); + styles[i][BACK] = ROTATE_RGB(p_sci->send_message(doc->editor->sci, SCI_STYLEGETBACK, i, 0)); + styles[i][BOLD] = p_sci->send_message(doc->editor->sci, SCI_STYLEGETBOLD, i, 0); + styles[i][ITALIC] = p_sci->send_message(doc->editor->sci, SCI_STYLEGETITALIC, i, 0); styles[i][USED] = 0; } @@ -581,18 +581,18 @@ font_name = pango_font_description_get_family(font_desc); /*font_size = pango_font_description_get_size(font_desc) / PANGO_SCALE;*/ /* take the zoom level also into account */ - font_size = p_sci->send_message(doc->editor->scintilla, SCI_STYLEGETSIZE, 0, 0); + font_size = p_sci->send_message(doc->editor->sci, SCI_STYLEGETSIZE, 0, 0); if (use_zoom) - font_size += p_sci->send_message(doc->editor->scintilla, SCI_GETZOOM, 0, 0); + font_size += p_sci->send_message(doc->editor->sci, SCI_GETZOOM, 0, 0); /* read the document and write the HTML body */ body = g_string_new(""); - for (i = 0; i < p_sci->get_length(doc->editor->scintilla); i++) + for (i = 0; i < p_sci->get_length(doc->editor->sci); i++) { - style = p_sci->get_style_at(doc->editor->scintilla, i); - c = p_sci->get_char_at(doc->editor->scintilla, i); + style = p_sci->get_style_at(doc->editor->sci, i); + c = p_sci->get_char_at(doc->editor->sci, i); /* p_sci->get_char_at() takes care of index boundaries and return 0 if i is too high */ - c_next = p_sci->get_char_at(doc->editor->scintilla, i + 1); + c_next = p_sci->get_char_at(doc->editor->sci, i + 1); if ((style != old_style || ! span_open) && ! isspace(c)) { Modified: branches/editor-struct/plugins/htmlchars.c =================================================================== --- branches/editor-struct/plugins/htmlchars.c 2008-07-13 11:51:00 UTC (rev 2775) +++ branches/editor-struct/plugins/htmlchars.c 2008-07-14 11:13:54 UTC (rev 2776) @@ -446,12 +446,12 @@ if (doc != NULL) { gchar *str; - gint pos = p_sci->get_current_position(doc->editor->scintilla); + gint pos = p_sci->get_current_position(doc->editor->sci); gtk_tree_model_get(model, iter, COLUMN_HTML_NAME, &str, -1); if (NZV(str)) { - p_sci->insert_text(doc->editor->scintilla, pos, str); + p_sci->insert_text(doc->editor->sci, pos, str); g_free(str); result = TRUE; } Modified: branches/editor-struct/plugins/vcdiff.c =================================================================== --- branches/editor-struct/plugins/vcdiff.c 2008-07-13 11:51:00 UTC (rev 2775) +++ branches/editor-struct/plugins/vcdiff.c 2008-07-14 11:13:54 UTC (rev 2776) @@ -285,9 +285,9 @@ } else { - p_sci->set_text(doc->editor->scintilla, text); + p_sci->set_text(doc->editor->sci, text); book = GTK_NOTEBOOK(geany->main_widgets->notebook); - page = gtk_notebook_page_num(book, GTK_WIDGET(doc->editor->scintilla)); + page = gtk_notebook_page_num(book, GTK_WIDGET(doc->editor->sci)); gtk_notebook_set_current_page(book, page); p_document->set_text_changed(doc, FALSE); } Modified: branches/editor-struct/src/callbacks.c =================================================================== --- branches/editor-struct/src/callbacks.c 2008-07-13 11:51:00 UTC (rev 2775) +++ branches/editor-struct/src/callbacks.c 2008-07-14 11:13:54 UTC (rev 2776) @@ -112,7 +112,7 @@ { if (insert_callback_from_menu) { - editor_info.click_pos = sci_get_current_position(doc->editor->scintilla); + editor_info.click_pos = sci_get_current_position(doc->editor->sci); insert_callback_from_menu = FALSE; } } @@ -305,7 +305,7 @@ gtk_editable_cut_clipboard(GTK_EDITABLE(focusw)); else if (IS_SCINTILLA(focusw) && doc != NULL) - sci_cut(doc->editor->scintilla); + sci_cut(doc->editor->sci); else if (GTK_IS_TEXT_VIEW(focusw)) { @@ -327,7 +327,7 @@ gtk_editable_copy_clipboard(GTK_EDITABLE(focusw)); else if (IS_SCINTILLA(focusw) && doc != NULL) - sci_copy(doc->editor->scintilla); + sci_copy(doc->editor->sci); else if (GTK_IS_TEXT_VIEW(focusw)) { @@ -360,12 +360,12 @@ gchar *content = gtk_clipboard_wait_for_text(gtk_clipboard_get(GDK_NONE)); if (content != NULL) { - sci_replace_sel(doc->editor->scintilla, content); + sci_replace_sel(doc->editor->sci, content); g_free(content); } } #else - sci_paste(doc->editor->scintilla); + sci_paste(doc->editor->sci); #endif } else @@ -390,7 +390,7 @@ gtk_editable_delete_selection(GTK_EDITABLE(focusw)); else if (IS_SCINTILLA(focusw) && doc != NULL) - sci_clear(doc->editor->scintilla); + sci_clear(doc->editor->sci); else if (GTK_IS_TEXT_VIEW(focusw)) { @@ -658,9 +658,9 @@ if (doc != NULL) { if (done++ % 3 == 0) - sci_set_line_numbers(doc->editor->scintilla, editor_prefs.show_linenumber_margin, - (sci_get_zoom(doc->editor->scintilla) / 2)); - sci_zoom_in(doc->editor->scintilla); + sci_set_line_numbers(doc->editor->sci, editor_prefs.show_linenumber_margin, + (sci_get_zoom(doc->editor->sci) / 2)); + sci_zoom_in(doc->editor->sci); } } @@ -672,9 +672,9 @@ GeanyDocument *doc = document_get_current(); if (doc != NULL) { - if (sci_get_zoom(doc->editor->scintilla) == 0) - sci_set_line_numbers(doc->editor->scintilla, editor_prefs.show_linenumber_margin, 0); - sci_zoom_out(doc->editor->scintilla); + if (sci_get_zoom(doc->editor->sci) == 0) + sci_set_line_numbers(doc->editor->sci, editor_prefs.show_linenumber_margin, 0); + sci_zoom_out(doc->editor->sci); } } @@ -686,8 +686,8 @@ GeanyDocument *doc = document_get_current(); if (doc != NULL) { - sci_zoom_off(doc->editor->scintilla); - sci_set_line_numbers(doc->editor->scintilla, editor_prefs.show_linenumber_margin, 0); + sci_zoom_off(doc->editor->sci); + sci_set_line_numbers(doc->editor->sci, editor_prefs.show_linenumber_margin, 0); } } @@ -779,8 +779,8 @@ { GeanyDocument *doc = document_get_current(); if (ignore_callback || doc == NULL) return; - sci_convert_eols(doc->editor->scintilla, SC_EOL_CRLF); - sci_set_eol_mode(doc->editor->scintilla, SC_EOL_CRLF); + sci_convert_eols(doc->editor->sci, SC_EOL_CRLF); + sci_set_eol_mode(doc->editor->sci, SC_EOL_CRLF); } @@ -790,8 +790,8 @@ { GeanyDocument *doc = document_get_current(); if (ignore_callback || doc == NULL) return; - sci_convert_eols(doc->editor->scintilla, SC_EOL_LF); - sci_set_eol_mode(doc->editor->scintilla, SC_EOL_LF); + sci_convert_eols(doc->editor->sci, SC_EOL_LF); + sci_set_eol_mode(doc->editor->sci, SC_EOL_LF); } @@ -801,8 +801,8 @@ { GeanyDocument *doc = document_get_current(); if (ignore_callback || doc == NULL) return; - sci_convert_eols(doc->editor->scintilla, SC_EOL_CR); - sci_set_eol_mode(doc->editor->scintilla, SC_EOL_CR); + sci_convert_eols(doc->editor->sci, SC_EOL_CR); + sci_set_eol_mode(doc->editor->sci, SC_EOL_CR); } @@ -863,7 +863,7 @@ if (doc == NULL) return; - sci = doc->editor->scintilla; + sci = doc->editor->sci; if (! sci_can_copy(sci)) { keybindings_send_command(GEANY_KEY_GROUP_SELECT, GEANY_KEYS_SELECT_WORD); @@ -984,7 +984,7 @@ if (doc == NULL) return; doc->readonly = ! doc->readonly; - sci_set_readonly(doc->editor->scintilla, doc->readonly); + sci_set_readonly(doc->editor->sci, doc->readonly); ui_update_tab_status(doc); ui_update_statusbar(doc, -1); } @@ -1015,10 +1015,10 @@ if (doc == NULL) return; - if (sci_can_copy(doc->editor->scintilla)) + if (sci_can_copy(doc->editor->sci)) { /* take selected text if there is a selection */ - search_text = g_malloc(sci_get_selected_text_length(doc->editor->scintilla) + 1); - sci_get_selected_text(doc->editor->scintilla, search_text); + search_text = g_malloc(sci_get_selected_text_length(doc->editor->sci) + 1); + sci_get_selected_text(doc->editor->sci, search_text); flags = SCFIND_MATCHCASE; } else @@ -1042,7 +1042,7 @@ g_return_if_fail(doc != NULL); - sci_set_current_position(doc->editor->scintilla, editor_info.click_pos, FALSE); + sci_set_current_position(doc->editor->sci, editor_info.click_pos, FALSE); symbols_goto_tag(editor_info.current_word, definition); } @@ -1066,8 +1066,8 @@ if (doc == NULL) return; - pos = sci_get_current_position(doc->editor->scintilla); - editor_find_current_word(doc->editor->scintilla, pos, colour, sizeof colour, GEANY_WORDCHARS"#"); + pos = sci_get_current_position(doc->editor->sci); + editor_find_current_word(doc->editor->sci, pos, colour, sizeof colour, GEANY_WORDCHARS"#"); tools_color_chooser(colour); } @@ -1186,12 +1186,12 @@ GeanyDocument *doc = document_get_current(); gint line = strtol(gtk_entry_get_text(GTK_ENTRY(user_data)), NULL, 10); - if (doc != NULL && line > 0 && line <= sci_get_line_count(doc->editor->scintilla)) + if (doc != NULL && line > 0 && line <= sci_get_line_count(doc->editor->sci)) { gint pos; line--; /* the user counts lines from 1, we begin at 0 so bring the user line to our one */ - pos = sci_get_position_from_line(doc->editor->scintilla, line); + pos = sci_get_position_from_line(doc->editor->sci, line); editor_goto_pos(doc->editor, pos, TRUE); } else @@ -1291,11 +1291,11 @@ /* symbols_get_current_function returns -1 on failure, so sci_get_position_from_line * returns the current position, so it should be safe */ line = symbols_get_current_function(doc, &cur_tag); - pos = sci_get_position_from_line(doc->editor->scintilla, line - 1); + pos = sci_get_position_from_line(doc->editor->sci, line - 1); text = templates_get_template_function(doc->file_type->id, cur_tag); - sci_insert_text(doc->editor->scintilla, pos, text); + sci_insert_text(doc->editor->sci, pos, text); g_free(text); } @@ -1333,7 +1333,7 @@ verify_click_pos(doc); /* make sure that the click_pos is valid */ - sci_insert_text(doc->editor->scintilla, editor_info.click_pos, text); + sci_insert_text(doc->editor->sci, editor_info.click_pos, text); g_free(text); } @@ -1353,7 +1353,7 @@ verify_click_pos(doc); /* make sure that the click_pos is valid */ - sci_insert_text(doc->editor->scintilla, editor_info.click_pos, text); + sci_insert_text(doc->editor->sci, editor_info.click_pos, text); g_free(text); } @@ -1370,10 +1370,10 @@ return; text = templates_get_template_changelog(); - sci_insert_text(doc->editor->scintilla, 0, text); + sci_insert_text(doc->editor->sci, 0, text); /* sets the cursor to the right position to type the changelog text, * the template has 21 chars + length of name and email */ - sci_goto_pos(doc->editor->scintilla, 21 + strlen(template_prefs.developer) + strlen(template_prefs.mail), TRUE); + sci_goto_pos(doc->editor->sci, 21 + strlen(template_prefs.developer) + strlen(template_prefs.mail), TRUE); g_free(text); } @@ -1394,8 +1394,8 @@ fname = doc->file_name; text = templates_get_template_fileheader(FILETYPE_ID(ft), fname); - sci_insert_text(doc->editor->scintilla, 0, text); - sci_goto_pos(doc->editor->scintilla, 0, FALSE); + sci_insert_text(doc->editor->sci, 0, text); + sci_goto_pos(doc->editor->sci, 0, FALSE); g_free(text); } @@ -1456,8 +1456,8 @@ { verify_click_pos(doc); /* make sure that the click_pos is valid */ - sci_insert_text(doc->editor->scintilla, editor_info.click_pos, time_str); - sci_goto_pos(doc->editor->scintilla, editor_info.click_pos + strlen(time_str), FALSE); + sci_insert_text(doc->editor->sci, editor_info.click_pos, time_str); + sci_goto_pos(doc->editor->sci, editor_info.click_pos + strlen(time_str), FALSE); } else { @@ -1490,10 +1490,10 @@ text = g_strconcat("#include <", user_data, ">\n", NULL); } - sci_insert_text(doc->editor->scintilla, editor_info.click_pos, text); + sci_insert_text(doc->editor->sci, editor_info.click_pos, text); g_free(text); if (pos >= 0) - sci_goto_pos(doc->editor->scintilla, pos, FALSE); + sci_goto_pos(doc->editor->sci, pos, FALSE); } @@ -1591,7 +1591,7 @@ GeanyDocument *doc = document_get_current(); if (doc != NULL) - sci_select_all(doc->editor->scintilla); + sci_select_all(doc->editor->sci); } @@ -1695,24 +1695,24 @@ if (doc == NULL) return; - if (sci_get_lines_selected(doc->editor->scintilla) > 1) + if (sci_get_lines_selected(doc->editor->sci) > 1) { - sci_cmd(doc->editor->scintilla, SCI_TAB); + sci_cmd(doc->editor->sci, SCI_TAB); } else { gint line, ind_pos, old_pos, new_pos, step; - old_pos = sci_get_current_position(doc->editor->scintilla); - line = sci_get_line_from_position(doc->editor->scintilla, old_pos); - ind_pos = sci_get_line_indent_position(doc->editor->scintilla, line); + old_pos = sci_get_current_position(doc->editor->sci); + line = sci_get_line_from_position(doc->editor->sci, old_pos); + ind_pos = sci_get_line_indent_position(doc->editor->sci, line); /* when using tabs increase cur pos by 1, when using space increase it by tab_width */ step = (doc->editor->use_tabs) ? 1 : editor_prefs.tab_width; new_pos = (old_pos > ind_pos) ? old_pos + step : old_pos; - sci_set_current_position(doc->editor->scintilla, ind_pos, TRUE); - sci_cmd(doc->editor->scintilla, SCI_TAB); - sci_set_current_position(doc->editor->scintilla, new_pos, TRUE); + sci_set_current_position(doc->editor->sci, ind_pos, TRUE); + sci_cmd(doc->editor->sci, SCI_TAB); + sci_set_current_position(doc->editor->sci, new_pos, TRUE); } } @@ -1725,31 +1725,31 @@ if (doc == NULL) return; - if (sci_get_lines_selected(doc->editor->scintilla) > 1) + if (sci_get_lines_selected(doc->editor->sci) > 1) { - sci_cmd(doc->editor->scintilla, SCI_BACKTAB); + sci_cmd(doc->editor->sci, SCI_BACKTAB); } else { gint line, ind_pos, old_pos, new_pos, step, indent; - old_pos = sci_get_current_position(doc->editor->scintilla); - line = sci_get_line_from_position(doc->editor->scintilla, old_pos); - ind_pos = sci_get_line_indent_position(doc->editor->scintilla, line); + old_pos = sci_get_current_position(doc->editor->sci); + line = sci_get_line_from_position(doc->editor->sci, old_pos); + ind_pos = sci_get_line_indent_position(doc->editor->sci, line); step = (doc->editor->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->editor->scintilla, line)) + if (ind_pos == sci_get_position_from_line(doc->editor->sci, line)) return; - sci_set_current_position(doc->editor->scintilla, ind_pos, TRUE); - indent = sci_get_line_indentation(doc->editor->scintilla, line); + sci_set_current_position(doc->editor->sci, ind_pos, TRUE); + indent = sci_get_line_indentation(doc->editor->sci, line); indent -= editor_prefs.tab_width; if (indent < 0) indent = 0; - sci_set_line_indentation(doc->editor->scintilla, line, indent); + sci_set_line_indentation(doc->editor->sci, line, indent); - sci_set_current_position(doc->editor->scintilla, new_pos, TRUE); + sci_set_current_position(doc->editor->sci, new_pos, TRUE); } } @@ -1923,8 +1923,8 @@ if (doc == NULL) return; - sci_marker_delete_all(doc->editor->scintilla, 0); /* delete the yellow tag marker */ - sci_marker_delete_all(doc->editor->scintilla, 1); /* delete user markers */ + sci_marker_delete_all(doc->editor->sci, 0); /* delete the yellow tag marker */ + sci_marker_delete_all(doc->editor->sci, 1); /* delete user markers */ } @@ -1947,10 +1947,10 @@ if (doc == NULL) return; - if (sci_can_copy(doc->editor->scintilla)) + if (sci_can_copy(doc->editor->sci)) { /* take selected text if there is a selection */ - word = g_malloc(sci_get_selected_text_length(doc->editor->scintilla) + 1); - sci_get_selected_text(doc->editor->scintilla, word); + word = g_malloc(sci_get_selected_text_length(doc->editor->sci) + 1); + sci_get_selected_text(doc->editor->sci, word); } else { Modified: branches/editor-struct/src/document.c =================================================================== --- branches/editor-struct/src/document.c 2008-07-13 11:51:00 UTC (rev 2775) +++ branches/editor-struct/src/document.c 2008-07-14 11:13:54 UTC (rev 2776) @@ -192,7 +192,7 @@ for (i = 0; i < documents_array->len; i++) { - if (documents[i]->is_valid && documents[i]->editor->scintilla == sci) + if (documents[i]->is_valid && documents[i]->editor->sci == sci) return documents[i]; } return NULL; @@ -206,7 +206,7 @@ return -1; return gtk_notebook_page_num(GTK_NOTEBOOK(main_widgets.notebook), - GTK_WIDGET(doc->editor->scintilla)); + GTK_WIDGET(doc->editor->sci)); } @@ -296,7 +296,7 @@ g_return_if_fail(doc != NULL); - sci = doc->editor->scintilla; + sci = doc->editor->sci; sci_set_mark_long_lines(sci, editor_prefs.long_line_type, editor_prefs.long_line_column, editor_prefs.long_line_color); @@ -376,7 +376,7 @@ * document), we need to force a redraw, so the expose event is triggered. * This ensures we don't start colourising before all documents are opened/saved, * only once the editor is drawn. */ - gtk_widget_queue_draw(GTK_WIDGET(doc->editor->scintilla)); + gtk_widget_queue_draw(GTK_WIDGET(doc->editor->sci)); } @@ -546,21 +546,21 @@ g_assert(doc != NULL); - sci_set_undo_collection(doc->editor->scintilla, FALSE); /* avoid creation of an undo action */ + sci_set_undo_collection(doc->editor->sci, FALSE); /* avoid creation of an undo action */ if (text) - sci_set_text(doc->editor->scintilla, text); + sci_set_text(doc->editor->sci, text); else - sci_clear_all(doc->editor->scintilla); + sci_clear_all(doc->editor->sci); - sci_set_eol_mode(doc->editor->scintilla, file_prefs.default_eol_character); + sci_set_eol_mode(doc->editor->sci, file_prefs.default_eol_character); /* convert the eol chars in the template text in case they are different from * from file_prefs.default_eol */ if (text != NULL) - sci_convert_eols(doc->editor->scintilla, file_prefs.default_eol_character); + sci_convert_eols(doc->editor->sci, file_prefs.default_eol_character); editor_set_use_tabs(doc->editor, editor_prefs.use_tabs); - sci_set_undo_collection(doc->editor->scintilla, TRUE); - sci_empty_undo_buffer(doc->editor->scintilla); + sci_set_undo_collection(doc->editor->sci, TRUE); + sci_empty_undo_buffer(doc->editor->sci); doc->mtime = time(NULL); @@ -574,18 +574,18 @@ document_set_filetype(doc, ft); /* also clears taglist */ if (ft == NULL) - highlighting_set_styles(doc->editor->scintilla, GEANY_FILETYPES_NONE); + highlighting_set_styles(doc->editor->sci, GEANY_FILETYPES_NONE); ui_set_window_title(doc); build_menu_update(doc); document_update_tag_list(doc, FALSE); document_set_text_changed(doc, FALSE); ui_document_show_hide(doc); /* update the document menu */ - sci_set_line_numbers(doc->editor->scintilla, editor_prefs.show_linenumber_margin, 0); - sci_goto_pos(doc->editor->scintilla, 0, TRUE); + sci_set_line_numbers(doc->editor->sci, editor_prefs.show_linenumber_margin, 0); + sci_goto_pos(doc->editor->sci, 0, TRUE); /* "the" SCI signal (connect after initial setup(i.e. adding text)) */ - g_signal_connect((GtkWidget*) doc->editor->scintilla, "sci-notify", G_CALLBACK(on_editor_notification), doc); + g_signal_connect((GtkWidget*) doc->editor->sci, "sci-notify", G_CALLBACK(on_editor_notification), doc); if (geany_object) { @@ -850,20 +850,20 @@ { if (cl_options.goto_line >= 0) { /* goto line which was specified on command line and then undefine the line */ - sci_goto_line(editor->scintilla, cl_options.goto_line - 1, TRUE); + sci_goto_line(editor->sci, cl_options.goto_line - 1, TRUE); editor->scroll_percent = 0.5F; cl_options.goto_line = -1; } else if (pos > 0) { - sci_set_current_position(editor->scintilla, pos, FALSE); + sci_set_current_position(editor->sci, pos, FALSE); editor->scroll_percent = 0.5F; } if (cl_options.goto_column >= 0) { /* goto column which was specified on command line and then undefine the column */ - gint cur_pos = sci_get_current_position(editor->scintilla); - sci_set_current_position(editor->scintilla, cur_pos + cl_options.goto_column, FALSE); + gint cur_pos = sci_get_current_position(editor->sci); + sci_set_current_position(editor->sci, cur_pos + cl_options.goto_column, FALSE); editor->scroll_percent = 0.5F; cl_options.goto_column = -1; } @@ -911,7 +911,7 @@ editor_set_use_tabs(doc->editor, editor_prefs.use_tabs); else { /* detect & set tabs/spaces */ - gboolean use_tabs = detect_use_tabs(doc->editor->scintilla); + gboolean use_tabs = detect_use_tabs(doc->editor->sci); if (use_tabs != editor_prefs.use_tabs) ui_set_statusbar(TRUE, _("Setting %s indentation mode."), @@ -970,7 +970,7 @@ ui_add_recent_file(utf8_filename); /* either add or reorder recent item */ gtk_notebook_set_current_page(GTK_NOTEBOOK(main_widgets.notebook), gtk_notebook_page_num(GTK_NOTEBOOK(main_widgets.notebook), - (GtkWidget*) doc->editor->scintilla)); + (GtkWidget*) doc->editor->sci)); g_free(utf8_filename); g_free(locale_filename); document_check_disk_status(doc, TRUE); /* force a file changed check */ @@ -993,20 +993,20 @@ if (! reload) doc = document_create(utf8_filename); g_return_val_if_fail(doc != NULL, NULL); /* really should not happen */ - sci_set_undo_collection(doc->editor->scintilla, FALSE); /* avoid creation of an undo action */ - sci_empty_undo_buffer(doc->editor->scintilla); + sci_set_undo_collection(doc->editor->sci, FALSE); /* avoid creation of an undo action */ + sci_empty_undo_buffer(doc->editor->sci); /* add the text to the ScintillaObject */ - sci_set_readonly(doc->editor->scintilla, FALSE); /* to allow replacing text */ - sci_set_text(doc->editor->scintilla, filedata.data); /* NULL terminated data */ + sci_set_readonly(doc->editor->sci, FALSE); /* to allow replacing text */ + sci_set_text(doc->editor->sci, filedata.data); /* NULL terminated data */ queue_colourise(doc); /* Ensure the document gets colourised. */ /* detect & set line endings */ editor_mode = utils_get_line_endings(filedata.data, filedata.len); - sci_set_eol_mode(doc->editor->scintilla, editor_mode); + sci_set_eol_mode(doc->editor->sci, editor_mode); g_free(filedata.data); - sci_set_undo_collection(doc->editor->scintilla, TRUE); + sci_set_undo_collection(doc->editor->sci, TRUE); doc->mtime = filedata.mtime; /* get the modification time from file and keep it */ g_free(doc->encoding); /* if reloading, free old encoding */ @@ -1015,10 +1015,10 @@ store_saved_encoding(doc); /* store the opened encoding for undo/redo */ doc->readonly = readonly || filedata.readonly; - sci_set_readonly(doc->editor->scintilla, doc->readonly); + sci_set_readonly(doc->editor->sci, doc->readonly); /* update line number margin width */ - sci_set_line_numbers(doc->editor->scintilla, editor_prefs.show_linenumber_margin, 0); + sci_set_line_numbers(doc->editor->sci, editor_prefs.show_linenumber_margin, 0); /* set the cursor position according to pos, cl_options.goto_line and cl_options.goto_column */ set_cursor_position(doc->editor, pos); @@ -1030,7 +1030,7 @@ doc->real_path = get_real_path_from_utf8(doc->file_name); /* "the" SCI signal (connect after initial setup(i.e. adding text)) */ - g_signal_connect((GtkWidget*) doc->editor->scintilla, "sci-notify", + g_signal_connect((GtkWidget*) doc->editor->sci, "sci-notify", G_CALLBACK(on_editor_notification), doc); use_ft = (ft != NULL) ? ft : filetypes_detect_from_file(doc); @@ -1149,7 +1149,7 @@ return FALSE; /* try to set the cursor to the position before reloading */ - pos = sci_get_current_position(doc->editor->scintilla); + pos = sci_get_current_position(doc->editor->sci); new_doc = document_open_file_full(doc, NULL, pos, doc->readonly, doc->file_type, forced_enc); return (new_doc != NULL); @@ -1186,8 +1186,8 @@ gint line_start; /* for some reason we can use byte count instead of character count here */ - *line = sci_get_line_from_position(doc->editor->scintilla, byte_pos); - line_start = sci_get_position_from_line(doc->editor->scintilla, *line); + *line = sci_get_line_from_position(doc->editor->sci, byte_pos); + line_start = sci_get_position_from_line(doc->editor->sci, *line); /* get the column in the line */ *column = byte_pos - line_start; @@ -1195,7 +1195,7 @@ * skip one byte(i++) and decrease the column number which is based on byte count */ for (i = line_start; i < (line_start + *column); i++) { - if (sci_get_char_at(doc->editor->scintilla, i) < 0) + if (sci_get_char_at(doc->editor->sci, i) < 0) { (*column)--; i++; @@ -1217,14 +1217,14 @@ /* only search the first 3 lines */ ttf.chrg.cpMin = 0; - ttf.chrg.cpMax = sci_get_position_from_line(doc->editor->scintilla, 3); + ttf.chrg.cpMax = sci_get_position_from_line(doc->editor->sci, 3); ttf.lpstrText = (gchar*)filebase; - if (sci_find_text(doc->editor->scintilla, SCFIND_MATCHCASE, &ttf) != -1) + if (sci_find_text(doc->editor->sci, SCFIND_MATCHCASE, &ttf) != -1) { - sci_target_start(doc->editor->scintilla, ttf.chrgText.cpMin); - sci_target_end(doc->editor->scintilla, ttf.chrgText.cpMax); - sci_target_replace(doc->editor->scintilla, filename, FALSE); + sci_target_start(doc->editor->sci, ttf.chrgText.cpMin); + sci_target_end(doc->editor->sci, ttf.chrgText.cpMax); + sci_target_replace(doc->editor->sci, filename, FALSE); } g_free(filebase); @@ -1305,7 +1305,7 @@ /* don't read over the doc length */ gint max_len = MIN((gint)bytes_read + 6, (gint)*len - 1); context = g_malloc(7); /* read 6 bytes from Sci + '\0' */ - sci_get_text_range(doc->editor->scintilla, bytes_read, max_len, context); + sci_get_text_range(doc->editor->sci, bytes_read, max_len, context); /* take only one valid Unicode character from the context and discard the leftover */ unic = g_utf8_get_char_validated(context, -1); @@ -1410,7 +1410,7 @@ if (file_prefs.final_new_line) editor_ensure_final_newline(doc); - len = sci_get_length(doc->editor->scintilla) + 1; + len = sci_get_length(doc->editor->sci) + 1; if (doc->has_bom && encodings_is_unicode_charset(doc->encoding)) { /* always write a UTF-8 BOM because in this moment the text itself is still in UTF-8 * encoding, it will be converted to doc->encoding below and this conversion @@ -1419,13 +1419,13 @@ data[0] = (gchar) 0xef; data[1] = (gchar) 0xbb; data[2] = (gchar) 0xbf; - sci_get_text(doc->editor->scintilla, len, data + 3); + sci_get_text(doc->editor->sci, len, data + 3); len += 3; } else { data = (gchar*) g_malloc(len); - sci_get_text(doc->editor->scintilla, len, data); + sci_get_text(doc->editor->sci, len, data); } /* save in original encoding, skip when it is already UTF-8 or has the encoding "None" */ @@ -1470,8 +1470,8 @@ /* set line numbers again, to reset the margin width, if * there are more lines than before */ - sci_set_line_numbers(doc->editor->scintilla, editor_prefs.show_linenumber_margin, 0); - sci_set_savepoint(doc->editor->scintilla); + sci_set_line_numbers(doc->editor->sci, editor_prefs.show_linenumber_margin, 0); + sci_set_savepoint(doc->editor->sci); /* stat the file to get the timestamp, otherwise on Windows the actual * timestamp can be ahead of time(NULL) */ @@ -1515,38 +1515,38 @@ if (! *text) return TRUE; - start_pos = (inc) ? sci_get_selection_start(doc->editor->scintilla) : - sci_get_selection_end(doc->editor->scintilla); /* equal if no selection */ + start_pos = (inc) ? sci_get_selection_start(doc->editor->sci) : + sci_get_selection_end(doc->editor->sci); /* equal if no selection */ /* search cursor to end */ ttf.chrg.cpMin = start_pos; - ttf.chrg.cpMax = sci_get_length(doc->editor->scintilla); + ttf.chrg.cpMax = sci_get_length(doc->editor->sci); ttf.lpstrText = (gchar *)text; - search_pos = sci_find_text(doc->editor->scintilla, flags, &ttf); + search_pos = sci_find_text(doc->editor->sci, flags, &ttf); /* if no match, search start to cursor */ if (search_pos == -1) { ttf.chrg.cpMin = 0; ttf.chrg.cpMax = start_pos + strlen(text); - search_pos = sci_find_text(doc->editor->scintilla, flags, &ttf); + search_pos = sci_find_text(doc->editor->sci, flags, &ttf); } if (search_pos != -1) { - gint line = sci_get_line_from_position(doc->editor->scintilla, ttf.chrgText.cpMin); + gint line = sci_get_line_from_position(doc->editor->sci, ttf.chrgText.cpMin); /* unfold maybe folded results */ - sci_ensure_line_is_visible(doc->editor->scintilla, line); + sci_ensure_line_is_visible(doc->editor->sci, line); - sci_set_selection_start(doc->editor->scintilla, ttf.chrgText.cpMin); - sci_set_selection_end(doc->editor->scintilla, ttf.chrgText.cpMax); + sci_set_selection_start(doc->editor->sci, ttf.chrgText.cpMin); + sci_set_selection_end(doc->editor->sci, ttf.chrgText.cpMax); - if (! editor_line_in_view(doc->editor->scintilla, line)) + if (! editor_line_in_view(doc->editor->sci, line)) { /* we need to force scrolling in case the cursor is outside of the current visible area * GeanyDocument::scroll_percent doesn't work because sci isn't always updated * while searching */ - editor_scroll_to_line(doc->editor->scintilla, -1, 0.3F); + editor_scroll_to_line(doc->editor->sci, -1, 0.3F); } return TRUE; } @@ -1557,7 +1557,7 @@ ui_set_statusbar(FALSE, _("\"%s\" was not found."), text); } utils_beep(); - sci_goto_pos(doc->editor->scintilla, start_pos, FALSE); /* clear selection */ + sci_goto_pos(doc->editor->sci, start_pos, FALSE); /* clear selection */ return FALSE; } } @@ -1577,33 +1577,33 @@ if (flags & SCFIND_REGEXP) search_backwards = FALSE; - selection_start = sci_get_selection_start(doc->editor->scintilla); - selection_end = sci_get_selection_end(doc->editor->scintilla); + selection_start = sci_get_selection_start(doc->editor->sci); + selection_end = sci_get_selection_end(doc->editor->sci); if ((selection_end - selection_start) > 0) { /* there's a selection so go to the end */ if (search_backwards) - sci_goto_pos(doc->editor->scintilla, selection_start, TRUE); + sci_goto_pos(doc->editor->sci, selection_start, TRUE); else - sci_goto_pos(doc->editor->scintilla, selection_end, TRUE); + sci_goto_pos(doc->editor->sci, selection_end, TRUE); } - sci_set_search_anchor(doc->editor->scintilla); + sci_set_search_anchor(doc->editor->sci); if (search_backwards) - search_pos = sci_search_prev(doc->editor->scintilla, flags, text); + search_pos = sci_search_prev(doc->editor->sci, flags, text); else - search_pos = sci_search_next(doc->editor->scintilla, flags, text); + search_pos = sci_search_next(doc->editor->sci, flags, text); if (search_pos != -1) { /* unfold maybe folded results */ - sci_ensure_line_is_visible(doc->editor->scintilla, - sci_get_line_from_position(doc->editor->scintilla, search_pos)); + sci_ensure_line_is_visible(doc->editor->sci, + sci_get_line_from_position(doc->editor->sci, search_pos)); if (scroll) doc->editor->scroll_percent = 0.3F; } else { - gint sci_len = sci_get_length(doc->editor->scintilla); + gint sci_len = sci_get_length(doc->editor->sci); /* if we just searched the whole text, give up searching. */ if ((selection_end == 0 && ! search_backwards) || @@ -1621,11 +1621,11 @@ { gint ret; - sci_set_current_position(doc->editor->scintilla, (search_backwards) ? sci_len : 0, FALSE); + sci_set_current_position(doc->editor->sci, (search_backwards) ? sci_len : 0, FALSE); ret = document_find_text(doc, text, flags, search_backwards, scroll, parent); if (ret == -1) { /* return to original cursor position if not found */ - sci_set_current_position(doc->editor->scintilla, selection_start, FALSE); + sci_set_current_position(doc->editor->sci, selection_start, FALSE); } return ret; } @@ -1648,8 +1648,8 @@ if (flags & SCFIND_REGEXP) search_backwards = FALSE; - selection_start = sci_get_selection_start(doc->editor->scintilla); - selection_end = sci_get_selection_end(doc->editor->scintilla); + selection_start = sci_get_selection_start(doc->editor->sci); + selection_end = sci_get_selection_end(doc->editor->sci); if (selection_end == selection_start) { /* no selection so just find the next match */ @@ -1659,9 +1659,9 @@ /* there's a selection so go to the start before finding to search through it * this ensures there is a match */ if (search_backwards) - sci_goto_pos(doc->editor->scintilla, selection_end, TRUE); + sci_goto_pos(doc->editor->sci, selection_end, TRUE); else - sci_goto_pos(doc->editor->scintilla, selection_start, TRUE); + sci_goto_pos(doc->editor->sci, selection_start, TRUE); search_pos = document_find_text(doc, find_text, flags, search_backwards, TRUE, NULL); /* return if the original selected text did not match (at the start of the selection) */ @@ -1672,11 +1672,11 @@ { gint replace_len; /* search next/prev will select matching text, which we use to set the replace target */ - sci_target_from_selection(doc->editor->scintilla); - replace_len = sci_target_replace(doc->editor->scintilla, replace_text, flags & SCFIND_REGEXP); + sci_target_from_selection(doc->editor->sci); + replace_len = sci_target_replace(doc->editor->sci, replace_text, flags & SCFIND_REGEXP); /* select the replacement - find text will skip past the selected text */ - sci_set_selection_start(doc->editor->scintilla, search_pos); - sci_set_selection_end(doc->editor->scintilla, search_pos + replace_len); + sci_set_selection_start(doc->editor->sci, search_pos); + sci_set_selection_end(doc->editor->sci, search_pos + replace_len); } else { @@ -1741,7 +1741,7 @@ g_return_val_if_fail(doc != NULL && find_text != NULL && replace_text != NULL, 0); if (! *find_text || doc->readonly) return 0; - sci = doc->editor->scintilla; + sci = doc->editor->sci; sci_start_undo_action(sci); ttf.chrg.cpMin = start; @@ -1815,8 +1815,8 @@ g_return_if_fail(doc != NULL && find_text != NULL && replace_text != NULL); if (! *find_text) return; - selection_start = sci_get_selection_start(doc->editor->scintilla); - selection_end = sci_get_selection_end(doc->editor->scintilla); + selection_start = sci_get_selection_start(doc->editor->sci); + selection_end = sci_get_selection_end(doc->editor->sci); /* do we have a selection? */ if ((selection_end - selection_start) == 0) { @@ -1824,24 +1824,24 @@ return; } - selection_mode = sci_get_selection_mode(doc->editor->scintilla); - selected_lines = sci_get_lines_selected(doc->editor->scintilla); + selection_mode = sci_get_selection_mode(doc->editor->sci); + selected_lines = sci_get_lines_selected(doc->editor->sci); /* handle rectangle, multi line selections (it doesn't matter on a single line) */ if (selection_mode == SC_SEL_RECTANGLE && selected_lines > 1) { gint first_line, line; - sci_start_undo_action(doc->editor->scintilla); + sci_start_undo_action(doc->editor->sci); - first_line = sci_get_line_from_position(doc->editor->scintilla, selection_start); + first_line = sci_get_line_from_position(doc->editor->sci, selection_start); /* Find the last line with chars selected (not EOL char) */ - last_line = sci_get_line_from_position(doc->editor->scintilla, + last_line = sci_get_line_from_position(doc->editor->sci, selection_end - editor_get_eol_char_len(doc)); last_line = MAX(first_line, last_line); for (line = first_line; line < (first_line + selected_lines); line++) { - gint line_start = sci_get_pos_at_line_sel_start(doc->editor->scintilla, line); - gint line_end = sci_get_pos_at_line_sel_end(doc->editor->scintilla, line); + gint line_start = sci_get_pos_at_line_sel_start(doc->editor->sci, line); + gint line_end = sci_get_pos_at_line_sel_end(doc->editor->sci, line); /* skip line if there is no selection */ if (line_start != INVALID_POSITION) @@ -1856,11 +1856,11 @@ replaced = TRUE; /* this gets the greatest column within the selection after replacing */ max_column = MAX(max_column, - new_sel_end - sci_get_position_from_line(doc->editor->scintilla, line)); + new_sel_end - sci_get_position_from_line(doc->editor->sci, line)); } } } - sci_end_undo_action(doc->editor->scintilla); + sci_end_undo_action(doc->editor->sci); } else /* handle normal line selection */ { @@ -1876,26 +1876,26 @@ if (selection_mode == SC_SEL_RECTANGLE && selected_lines > 1) { /* now we can scroll to the selection and destroy it because we rebuild it later */ - /*sci_goto_pos(doc->editor->scintilla, selection_start, FALSE);*/ + /*sci_goto_pos(doc->editor->sci, selection_start, FALSE);*/ /* Note: the selection will be wrapped to last_line + 1 if max_column is greater than * the highest column on the last line. The wrapped selection is completely different * from the original one, so skip the selection at all */ /* TODO is there a better way to handle the wrapped selection? */ - if ((sci_get_line_length(doc->editor->scintilla, last_line) - 1) >= max_column) + if ((sci_get_line_length(doc->editor->sci, last_line) - 1) >= max_column) { /* for keeping and adjusting the selection in multi line rectangle selection we * need the last line of the original selection and the greatest column number after * replacing and set the selection end to the last line at the greatest column */ - sci_set_selection_start(doc->editor->scintilla, selection_start); - sci_set_selection_end(doc->editor->scintilla, - sci_get_position_from_line(doc->editor->scintilla, last_line) + max_column); - sci_set_selection_mode(doc->editor->scintilla, selection_mode); + sci_set_selection_start(doc->editor->sci, selection_start); + sci_set_selection_end(doc->editor->sci, + sci_get_position_from_line(doc->editor->sci, last_line) + max_column); + sci_set_selection_mode(doc->editor->sci, selection_mode); } } else { - sci_set_selection_start(doc->editor->scintilla, selection_start); - sci_set_selection_end(doc->editor->scintilla, selection_end); + sci_set_selection_start(doc->editor->sci, selection_start); + sci_set_selection_end(doc->editor->sci, selection_end); } } else /* no replacements */ @@ -1913,7 +1913,7 @@ g_return_val_if_fail(doc != NULL && find_text != NULL && replace_text != NULL, FALSE); if (! *find_text) return FALSE; - len = sci_get_length(doc->editor->scintilla); + len = sci_get_length(doc->editor->sci); count = document_replace_range( doc, find_text, replace_text, flags, 0, len, TRUE, NULL); @@ -2016,7 +2016,7 @@ gboolean ret = FALSE; guint n; const GString *s; - ScintillaObject *sci = doc ? doc->editor->scintilla : NULL; + ScintillaObject *sci = doc ? doc->editor->sci : NULL; if (sci != NULL && editor_lexer_get_type_keyword_idx(sci_get_lexer(sci)) == -1) return FALSE; @@ -2038,7 +2038,7 @@ { if (documents[n]->is_valid) { - ScintillaObject *wid = documents[n]->editor->scintilla; + ScintillaObject *wid = documents[n]->editor->sci; gint keyword_idx = editor_lexer_get_type_keyword_idx(sci_get_lexer(wid)); if (keyword_idx > 0) @@ -2079,7 +2079,7 @@ tm_workspace_remove_object(doc->tm_file, TRUE, TRUE); doc->tm_file = NULL; } - highlighting_set_styles(doc->editor->scintilla, type->id); + highlighting_set_styles(doc->editor->sci, type->id); build_menu_update(doc); queue_colourise(doc); } @@ -2192,7 +2192,7 @@ if (doc == NULL) return FALSE; - if (g_trash_stack_height(&fdoc->undo_actions) > 0 || sci_can_undo(doc->editor->scintilla)) + if (g_trash_stack_height(&fdoc->undo_actions) > 0 || sci_can_undo(doc->editor->sci)) return TRUE; else return FALSE; @@ -2204,7 +2204,7 @@ Document *fdoc = DOCUMENT(doc); doc->changed = - (sci_is_modified(doc->editor->scintilla) || + (sci_is_modified(doc->editor->sci) || doc->has_bom != fdoc->saved_encoding.has_bom || ! utils_str_equal(doc->encoding, fdoc->saved_encoding.encoding)); document_set_text_changed(doc, doc->changed); @@ -2225,7 +2225,7 @@ { /* fallback, should not be necessary */ geany_debug("%s: fallback used", __func__); - sci_undo(doc->editor->scintilla); + sci_undo(doc->editor->sci); } else { @@ -2235,7 +2235,7 @@ { document_redo_add(doc, UNDO_SCINTILLA, NULL); - sci_undo(doc->editor->scintilla); + sci_undo(doc->editor->sci); break; } case UNDO_BOM: @@ -2279,7 +2279,7 @@ if (doc == NULL) return FALSE; - if (g_trash_stack_height(&fdoc->redo_actions) > 0 || sci_can_redo(doc->editor->scintilla)) + if (g_trash_stack_height(&fdoc->redo_actions) > 0 || sci_can_redo(doc->editor->sci)) return TRUE; else return FALSE; @@ -2300,7 +2300,7 @@ { /* fallback, should not be necessary */ geany_debug("%s: fallback used", __func__); - sci_redo(doc->editor->scintilla); + sci_redo(doc->editor->sci); } else { @@ -2310,7 +2310,7 @@ { document_undo_add(doc, UNDO_SCINTILLA, NULL); - sci_redo(doc->editor->scintilla); + sci_redo(doc->editor->sci); break; } case UNDO_BOM: @@ -2402,9 +2402,9 @@ gchar *text; GeanyDocument *doc; - len = sci_get_length(old_doc->editor->scintilla) + 1; + len = sci_get_length(old_doc->editor->sci) + 1; text = (gchar*) g_malloc(len); - sci_get_text(old_doc->editor->scintilla, len, text); + sci_get_text(old_doc->editor->sci, len, text); /* use old file type (or maybe NULL for auto detect would be better?) */ doc = document_new_file(utf8_filename, old_doc->file_type, text); g_free(text); @@ -2414,8 +2414,8 @@ doc->readonly = old_doc->readonly; doc->has_bom = old_doc->has_bom; document_set_encoding(doc, old_doc->encoding); - sci_set_lines_wrapped(doc->editor->scintilla, doc->editor->line_wrapping); - sci_set_readonly(doc->editor->scintilla, doc->readonly); + sci_set_lines_wrapped(doc->editor->sci, doc->editor->line_wrapping); + sci_set_readonly(doc->editor->sci, doc->readonly); ui_document_show_hide(doc); return doc; Modified: branches/editor-struct/src/editor.c =================================================================== --- branches/editor-struct/src/editor.c 2008-07-13 11:51:00 UTC (rev 2775) +++ branches/editor-struct/src/editor.c 2008-07-14 11:13:54 UTC (rev 2776) @@ -180,20 +180,20 @@ if (doc == NULL) return FALSE; - editor_info.click_pos = sci_get_position_from_xy(doc->editor->scintilla, (gint)event->x, (gint)event->y, FALSE); + editor_info.click_pos = sci_get_position_from_xy(doc->editor->sci, (gint)event->x, (gint)event->y, FALSE); if (event->button == 1) { if (GDK_BUTTON_PRESS == event->type && editor_prefs.disable_dnd) { - gint ss = sci_get_selection_start(doc->editor->scintilla); - sci_set_selection_end(doc->editor->scintilla, ss); + gint ss = sci_get_selection_start(doc->editor->sci); + sci_set_selection_end(doc->editor->sci, ss); } return document_check_disk_status(doc, FALSE); } if (event->button == 3) { - editor_find_current_word(doc->editor->scintilla, editor_info.click_pos, + editor_find_current_word(doc->editor->sci, editor_info.click_pos, current_word, sizeof current_word, NULL); ui_update_popup_goto_items((current_word[0] != '\0') ? TRUE : FALSE); @@ -264,7 +264,7 @@ 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->editor->scintilla, 1);*/ + /*sci_marker_delete_all(doc->editor->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 */ @@ -277,7 +277,7 @@ static void on_update_ui(GeanyEditor *editor, G_GNUC_UNUSED SCNotification *nt) { - ScintillaObject *sci = editor->scintilla; + ScintillaObject *sci = editor->sci; gint pos = sci_get_current_position(sci); /* undo / redo menu update */ @@ -316,7 +316,7 @@ static void check_line_breaking(GeanyEditor *editor, gint pos, gchar c) { - ScintillaObject *sci = editor->scintilla; + ScintillaObject *sci = editor->sci; gint line, lstart; if (!editor->line_breaking) @@ -371,7 +371,7 @@ static void on_char_added(GeanyEditor *editor, SCNotification *nt) { - ScintillaObject *sci = editor->scintilla; + ScintillaObject *sci = editor->sci; gint pos = sci_get_current_position(sci); switch (nt->ch) @@ -575,7 +575,7 @@ GeanyEditor *editor; editor = doc->editor; - sci = editor->scintilla; + sci = editor->sci; nt = lscn; switch (nt->nmhdr.code) @@ -725,7 +725,7 @@ static void check_python_indent(GeanyEditor *editor, gint pos) { - ScintillaObject *sci = editor->scintilla; + ScintillaObject *sci = editor->sci; gint last_char = pos - editor_get_eol_char_len(editor->document) - 1; /* add extra indentation for Python after colon */ @@ -743,7 +743,7 @@ static void on_new_line_added(GeanyEditor *editor) { - ScintillaObject *sci = editor->scintilla; + ScintillaObject *sci = editor->sci; gint pos = sci_get_current_position(sci); gint line = sci_get_current_line(sci); @@ -819,7 +819,7 @@ * and ignore the case of editor_close_block */ static void get_indent(GeanyEditor *editor, gint pos, gboolean use_this_line) { - ScintillaObject *sci = editor->scintilla; + ScintillaObject *sci = editor->sci; guint i, len, j = 0; gint prev_line; gchar *linebuf; @@ -942,7 +942,7 @@ if (doc == NULL || doc->file_type == NULL) return; - sci = doc->editor->scintilla; + sci = doc->editor->sci; if (! lexer_has_braces(sci)) return; @@ -1201,7 +1201,7 @@ if (doc == NULL || doc->file_type == NULL) return FALSE; - sci = doc->editor->scintilla; + sci = doc->editor->sci; lexer = SSM(sci, SCI_GETLEXER, 0, 0); @@ -1285,7 +1285,7 @@ if (doc == NULL || doc->file_type == NULL) return FALSE; - sci = doc->editor->scintilla; + sci = doc->editor->sci; tags = tm_workspace_find(root, tm_tag_max_t, attrs, TRUE, doc->file_type->lang); if (NULL != tags && tags->len > 0) @@ -1339,7 +1339,7 @@ doc == NULL || doc->file_type == NULL) return FALSE; - sci = doc->editor->scintilla; + sci = doc->editor->sci; ft = doc->file_type; line = sci_get_line_from_position(sci, pos); @@ -1400,7 +1400,7 @@ if (doc == NULL || doc->file_type == NULL) return; - sci = doc->editor->scintilla; + sci = doc->editor->sci; if (sci_get_char_at(sci, pos - 2) == '}') { @@ -1531,7 +1531,7 @@ gint step, str_len; gint ft_id = FILETYPE_ID(editor->document->file_type); GHashTable *specials; - ScintillaObject *sci = editor->scintilla; + ScintillaObject *sci = editor->sci; str = g_strdup(word); g_strstrip(str); @@ -1619,7 +1619,7 @@ if (doc == NULL) return FALSE; - sci = doc->editor->scintilla; + sci = doc->editor->sci; /* return if we are editing an existing line (chars on right of cursor) */ if (! editor_prefs.complete_snippets_whilst_editing && ! at_eol(sci, pos)) return FALSE; @@ -1661,7 +1661,7 @@ static void insert_closing_tag(GeanyEditor *editor, gint pos, gchar ch, const gchar *tag_name) { - ScintillaObject *sci = editor->scintilla; + ScintillaObject *sci = editor->sci; gchar *to_insert = NULL; if (ch == '/') @@ -1697,7 +1697,7 @@ */ static gboolean handle_xml(GeanyEditor *editor, gchar ch) { - ScintillaObject *sci = editor->scintilla; + ScintillaObject *sci = editor->sci; gint lexer = SSM(sci, SCI_GETLEXER, 0, 0); gint pos, min; gchar *str_found, sel[512]; @@ -1764,7 +1764,7 @@ static void auto_table(GeanyEditor *editor, gint pos) { - ScintillaObject *sci = editor->scintilla; + ScintillaObject *sci = editor->sci; gchar *table; gint indent_pos; @@ -1809,9 +1809,9 @@ str_end = g_strdup_printf("%s%s", doc->file_type->comment_close, eol); /* insert the comment strings */ - sci_insert_text(doc->editor->scintilla, line_start, str_begin); - line_len = sci_get_position_from_line(doc->editor->scintilla, last_line + 2); - sci_insert_text(doc->editor->scintilla, line_len, str_end); + sci_insert_text(doc->editor->sci, line_start, str_begin); + line_len = sci_get_position_from_line(doc->editor->sci, last_line + 2); + sci_insert_text(doc->editor->sci, line_len, str_end); g_free(str_begin); g_free(str_end); @@ -1829,28 +1829,28 @@ /* remove comment open chars */ pos = document_find_text(doc, doc->file_type->comment_open, 0, TRUE, FALSE, NULL); - SSM(doc->editor->scintilla, SCI_DELETEBACK, 0, 0); + SSM(doc->editor->sci, SCI_DELETEBACK, 0, 0); /* check whether the line is empty and can be deleted */ - line = sci_get_line_from_position(doc->editor->scintilla, pos); - len = sci_get_line_length(doc->editor->scintilla, line); - linebuf = sci_get_line(doc->editor->scintilla, line); + line = sci_get_line_from_position(doc->editor->sci, pos); + len = sci_get_line_length(doc->editor->sci, line); + linebuf = sci_get_line(doc->editor->sci, line); x = 0; while (linebuf[x] != '\0' && isspace(linebuf[x])) x++; - if (x == len) SSM(doc->editor->scintilla, SCI_LINEDELETE, 0, 0); + if (x == len) SSM(doc->editor->sci, SCI_LINEDELETE, 0, 0); g_free(linebuf); /* remove comment close chars */ pos = document_find_text(doc, doc->file_type->comment_close, 0, FALSE, FALSE, NULL); - SSM(doc->editor->scintilla, SCI_DELETEBACK, 0, 0); + SSM(doc->editor->sci, SCI_DELETEBACK, 0, 0); /* check whether the line is empty and can be deleted */ - line = sci_get_line_from_position(doc->editor->scintilla, pos); - len = sci_get_line_length(doc->editor->scintilla, line); - linebuf = sci_get_line(doc->editor->scintilla, line); + line = sci_get_line_from_position(doc->editor->sci, pos); + len = sci_get_line_length(doc->editor->sci, line); + linebuf = sci_get_line(doc->editor->sci, line); x = 0; while (linebuf[x] != '\0' && isspace(linebuf[x])) x++; - if (x == len) SSM(doc->editor->scintilla, SCI_LINEDELETE, 0, 0); + if (x == len) SSM(doc->editor->sci, SCI_LINEDELETE, 0, 0); g_free(linebuf); } @@ -1874,29 +1874,29 @@ if (line < 0) { /* use selection or current line */ - sel_start = sci_get_selection_start(doc->editor->scintilla); - sel_end = sci_get_selection_end(doc->editor->scintilla); + sel_start = sci_get_selection_start(doc->editor->sci); + sel_end = sci_get_selection_end(doc->editor->sci); - first_line = sci_get_line_from_position(doc->editor->scintilla, sel_start); + first_line = sci_get_line_from_position(doc->editor->sci, sel_start); /* Find the last line with chars selected (not EOL char) */ - last_line = sci_get_line_from_position(doc->editor->scintilla, + last_line = sci_get_line_from_position(doc->editor->sci, sel_end - editor_get_eol_char_len(doc)); last_line = MAX(first_line, last_line); } else { first_line = last_line = line; - sel_start = sel_end = sci_get_position_from_line(doc->editor->scintilla, line); + sel_start = sel_end = sci_get_position_from_line(doc->editor->sci, line); } ft = doc->file_type; /* detection of HTML vs PHP code, if non-PHP set filetype to XML */ - line_start = sci_get_position_from_line(doc->editor->scintilla, first_line); + line_start = sci_get_position_from_line(doc->editor->sci, first_line); if (ft->id == GEANY_FILETYPES_PHP) { - if (sci_get_style_at(doc->editor->scintilla, line_start) < 118 || - sci_get_style_at(doc->editor->scintilla, line_start) > 127) + if (sci_get_style_at(doc->editor->sci, line_start) < 118 || + sci_get_style_at(doc->editor->sci, line_start) > 127) ft = filetypes[GEANY_FILETYPES_XML]; } @@ -1909,20 +1909,20 @@ if (co_len == 0) return 0; - SSM(doc->editor->scintilla, SCI_BEGINUNDOACTION, 0, 0); + SSM(doc->editor->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->editor->scintilla, i); - line_len = sci_get_line_length(doc->editor->scintilla, i); + line_start = sci_get_position_from_line(doc->editor->sci, i); + line_len = sci_get_line_length(doc->editor->sci, i); x = 0; buf_len = MIN((gint)sizeof(sel) - 1, line_len - 1); if (buf_len <= 0) continue; - sci_get_text_range(doc->editor->scintilla, line_start, line_start + buf_len, sel); + sci_get_text_range(doc->editor->sci, line_start, line_start + buf_len, sel); sel[buf_len] = '\0'; while (isspace(sel[x])) x++; @@ -1951,15 +1951,15 @@ continue; } - SSM(doc->editor->scintilla, SCI_SETSEL, line_start + x, line_start + x + co_len); - sci_replace_sel(doc->editor->scintilla, ""); + SSM(doc->editor->sci, SCI_SETSEL, line_start + x, line_start + x + co_len); + sci_replace_sel(doc->editor->sci, ""); count++; } /* use multi line comment */ else { gint style_comment; - gint lexer = SSM(doc->editor->scintilla, SCI_GETLEXER, 0, 0); + gint lexer = SSM(doc->editor->sci, SCI_GETLEXER, 0, 0); /* process only lines which are already comments */ switch (lexer) @@ -1967,8 +1967,8 @@ case SCLEX_XML: case SCLEX_HTML: { - if (sci_get_style_at(doc->editor->scintilla, line_start) >= 118 && - sci_get_style_at(doc->editor->scintilla, line_start) <= 127) + if (sci_get_style_at(doc->editor->sci, line_start) >= 118 && + sci_get_style_at(doc->editor->sci, line_start) <= 127) style_comment = SCE_HPHP_COMMENT; else style_comment = SCE_H_COMMENT; break; @@ -1979,7 +1979,7 @@ case SCLEX_D: style_comment = SCE_D_COMMENT; break; default: style_comment = SCE_C_COMMENT; } - if (sci_get_style_at(doc->editor->scintilla, line_start + x) == style_comment) + if (sci_get_style_at(doc->editor->sci, line_start + x) == style_comment) { real_uncomment_multiline(doc); count = 1; @@ -1991,7 +1991,7 @@ } } } - SSM(doc->editor->scintilla, SCI_ENDUNDOACTION, 0, 0); + SSM(doc->editor->sci, SCI_ENDUNDOACTION, 0, 0); /* restore selection if there is one * but don't touch the selection if caller is editor_do_comment_toggle */ @@ -1999,14 +1999,14 @@ { if (single_line) { - sci_set_selection_start(doc->editor->scintilla, sel_start - co_len); - sci_set_selection_end(doc->editor->scintilla, sel_end - (count * co_len)); + sci_set_selection_start(doc->editor->sci, sel_start - co_len); + sci_set_selection_end(doc->editor->sci, sel_end - (count * co_len)); } else { gint eol_len = editor_get_eol_char_len(doc); - sci_set_selection_start(doc->editor->scintilla, sel_start - co_len - eol_len); - sci_set_selection_end(doc->editor->scintilla, sel_end - co_len - eol_len); + sci_set_selection_start(doc->editor->sci, sel_start - co_len - eol_len); + sci_set_selection_end(doc->editor->sci, sel_end - co_len - eol_len); } } @@ -2030,24 +2030,24 @@ if (doc == NULL || doc->file_type == NULL) return; - sel_start = sci_get_selection_start(doc->editor->scintilla); - sel_end = sci_get_selection_end(doc->editor->scintilla); + sel_start = sci_get_selection_start(doc->editor->sci); + sel_end = sci_get_selection_end(doc->editor->sci); ft = doc->file_type; - first_line = sci_get_line_from_position(doc->editor->scintilla, - sci_get_selection_start(doc->editor->scintilla)); + first_line = sci_get_line_from_position(doc->editor->sci, + sci_get_selection_start(doc->editor->sci)); /* Find the last line with chars selected (not EOL char) */ - last_line = sci_get_line_from_position(doc->editor->scintilla, - sci_get_selection_end(doc->editor->scintilla) - editor_get_eol_char_len(doc)); + last_line = sci_get_line_from_position(doc->editor->sci, + sci_get_selection_end(doc->editor->sci) - editor_get_eol_char_len(doc)); last_line = MAX(first_line, last_line); /* detection of HTML vs PHP code, if non-PHP set filetype to XML */ - first_line_start = sci_get_position_from_line(doc->editor->scintilla, first_line); + first_line_start = sci_get_position_from_line(doc->editor->sci, first_line); if (ft->id == GEANY_FILETYPES_PHP) { - if (sci_get_style_at(doc->editor->scintilla, first_line_start) < 118 || - sci_get_style_at(doc->editor->scintilla, first_line_start) > 127) + if (sci_get_style_at(doc->editor->sci, first_line_start) < 118 || + sci_get_style_at(doc->editor->sci, first_line_start) > 127) ft = filetypes[GEANY_FILETYPES_XML]; } @@ -2060,20 +2060,20 @@ if (co_len == 0) return; - SSM(doc->editor->scintilla, SCI_BEGINUNDOACTION, 0, 0); + SSM(doc->editor->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->editor->scintilla, i); - line_len = sci_get_line_length(doc->editor->scintilla, i); + line_start = sci_get_position_from_line(doc->editor->sci, i); + line_len = sci_get_line_length(doc->editor->sci, i); x = 0; buf_len = MIN((gint)sizeof(sel) - 1, line_len - 1); if (buf_len < 0) continue; - sci_get_text_range(doc->editor->scintilla, line_start, line_start + buf_len, sel); + sci_get_text_range(doc->editor->sci, line_start, line_start + buf_len, sel); sel[buf_len] = '\0'; while (isspace(sel[x])) x++; @@ -2107,7 +2107,7 @@ else { gint style_comment; - gint lexer = SSM(doc->editor->scintilla, SCI_GETLEXER, 0, 0); + gint lexer = SSM(doc->editor->sci, SCI_GETLEXER, 0, 0); /* skip lines which are already comments */ switch (lexer) @@ -2115,8 +2115,8 @@ case SCLEX_XML: case SCLEX_HTML: { - if (sci_get_style_at(doc->editor->scintilla, line_start) >= 118 && - sci_get_style_at(doc->editor->scintilla, line_start) <= 127) + if (sci_get_style_at(doc->editor->sci, line_start) >= 118 && + sci_get_style_at(doc->editor->sci, line_start) <= 127) style_comment = SCE_HPHP_COMMENT; else style_comment = SCE_H_COMMENT; break; @@ -2129,7 +2129,7 @@ case SCLEX_PERL: style_comment = SCE_PL_POD; break; default: style_comment = SCE_C_COMMENT; } - if (sci_get_style_at(doc->editor->scintilla, line_start + x) == style_comment) + if (sci_get_style_at(doc->editor->sci, line_start + x) == style_comment) { real_uncomment_multiline(doc); count_uncommented++; @@ -2146,7 +2146,7 @@ } } - SSM(doc->editor->scintilla, SCI_ENDUNDOACTION, 0, 0); + SSM(doc->editor->sci, SCI_ENDUNDOACTION, 0, 0); co_len += tm_len; @@ -2162,8 +2162,8 @@ if ((sel_start - first_line_start) <= (gint) strlen(indent)) a = 0; - sci_set_selection_start(doc->editor->scintilla, sel_start + a); - sci_set_selection_end(doc->editor->scintilla, sel_end + + sci_set_selection_start(doc->editor->sci, sel_start + a); + sci_set_selection_end(doc->editor->sci, sel_end + (count_commented * co_len) - (count_uncommented * co_len)); } else @@ -2171,19 +2171,19 @@ gint eol_len = editor_get_eol_char_len(doc); if (count_uncommented > 0) { - sci_set_selection_start(doc->editor->scintilla, sel_start - co_len - eol_len); - sci_set_selection_end(doc->editor->scintilla, sel_end - co_len - eol_len); + sci_set_selection_start(doc->editor->sci, sel_start - co_len - eol_len); + sci_set_selection_end(doc->editor->sci, sel_end - co_len - eol_len); } else { - sci_set_selection_start(doc->editor->scintilla, sel_start + co_len + eol_len); - sci_set_selection_end(doc->editor->scintilla, sel_end + co_len + eol_len); + sci_set_selection_start(doc->editor->sci, sel_start + co_len + eol_len); + sci_set_selection_end(doc->editor->sci, sel_end + co_len + eol_len); } } } else if (count_uncommented > 0) { - sci_set_current_position(doc->editor->scintilla, sel_start - co_len, TRUE); + sci_set_current_position(doc->editor->sci, sel_start - co_len, TRUE); } } @@ -2203,29 +2203,29 @@ if (line < 0) { /* use selection or current line */ - sel_start = sci_get_selection_start(doc->editor->scintilla); - sel_end = sci_get_selection_end(doc->editor->scintilla); + sel_start = sci_get_selection_start(doc->editor->sci); + sel_end = sci_get_selection_end(doc->editor->sci); - first_line = sci_get_line_from_position(doc->editor->scintilla, sel_start); + first_line = sci_get_line_from_position(doc->editor->sci, sel_start); /* Find the last line with chars selected (not EOL char) */ - last_line = sci_get_line_from_position(doc->editor->scintilla, + last_line = sci_get_line_from_position(doc->editor->sci, sel_end - editor_get_eol_char_len(doc)); last_line = MAX(first_line, last_line); } else { first_line = last_line = line; - sel_start = sel_end = sci_get_position_from_line(doc->editor->scintilla, line); + sel_start = sel_end = sci_get_position_from_line(doc->editor->sci, line); } ft = doc->file_type; /* detection of HTML vs PHP code, if non-PHP set filetype to XML */ - line_start = sci_get_position_from_line(doc->editor->scintilla, first_line); + line_start = sci_get_position_from_line(doc->editor->sci, first_line); if (ft->id == GEANY_FILETYPES_PHP) { - if (sci_get_style_at(doc->editor->scintilla, line_start) < 118 || - sci_get_style_at(doc->editor->scintilla, line_start) > 127) + if (sci_get_style_at(doc->editor->sci, line_start) < 118 || + sci_get_style_at(doc->editor->sci, line_start) > 127) ft = filetypes[GEANY_FILETYPES_XML]; } @@ -2238,20 +2238,20 @@ if (co_len == 0) return; - SSM(doc->editor->scintilla, SCI_BEGINUNDOACTION, 0, 0); + SSM(doc->editor->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->editor->scintilla, i); - line_len = sci_get_line_length(doc->editor->scintilla, i); + line_start = sci_get_position_from_line(doc->editor->sci, i); + line_len = sci_get_line_length(doc->editor->sci, i); x = 0; buf_len = MIN((gint)sizeof(sel) - 1, line_len - 1); if (buf_len < 0) continue; - sci_get_text_range(doc->editor->scintilla, line_start, line_start + buf_len, sel); + sci_get_text_range(doc->editor->sci, line_start, line_start + buf_len, sel); sel[buf_len] = '\0'; while (isspace(sel[x])) x++; @@ -2271,17 +2271,17 @@ if (toggle) { gchar *text = g_strconcat(co, GEANY_TOGGLE_MARK, NULL); - sci_insert_text(doc->editor->scintilla, start, text); + sci_insert_text(doc->editor->sci, start, text); g_free(text); } else - sci_insert_text(doc->editor->scintilla, start, co); + sci_insert_text(doc->editor->sci, start, co); } /* use multi line comment */ else { gint style_comment; - gint lexer = SSM(doc->editor->scintilla, SCI_GETLEXER, 0, 0); + gint lexer = SSM(doc->editor->sci, SCI_GETLEXER, 0, 0); /* skip lines which are already comments */ switch (lexer) @@ -2289,8 +2289,8 @@ case SCLEX_XML: case SCLEX_HTML: { - if (sci_get_style_at(doc->editor->scintilla, line_start) >= 118 && - sci_get_style_at(doc->editor->scintilla, line_start) <= 127) + if (sci_get_style_at(doc->editor->sci, line_start) >= 118 && + sci_get_style_at(doc->editor->sci, line_start) <= 127) style_comment = SCE_HPHP_COMMENT; else style_comment = SCE_H_COMMENT; break; @@ -2301,7 +2301,7 @@ case SCLEX_D: style_comment = SCE_D_COMMENT; break; default: style_comment = SCE_C_COMMENT; } - if (sci_get_style_at(doc->editor->scintilla, line_start + x) == style_comment) continue; + if (sci_get_style_at(doc->editor->sci, line_start + x) == style_comment) continue; real_comment_multiline(doc, line_start, last_line); @@ -2311,7 +2311,7 @@ } } } - SSM(doc->editor->scintilla, SCI_ENDUNDOACTION, 0, 0); + SSM(doc->editor->sci, SCI_ENDUNDOACTION, 0, 0); /* restore selection if there is one * but don't touch the selection if caller is editor_do_comment_toggle */ @@ -2319,14 +2319,14 @@ { if (single_line) { - sci_set_selection_start(doc->editor->scintilla, sel_start + co_len); - sci_set_selection_end(doc->editor->scintilla, sel_end + ((i - first_line) * co_len)); + sci_set_selection_start(doc->editor->sci, sel_start + co_len); + sci_set_selection_end(doc->editor->sci, sel_end + ((i - first_line) * co_len)); } else { gint eol_len = editor_get_eol_char_len(doc); - sci_set_selection_start(doc->editor->scintilla, sel_start + co_len + eol_len); - sci_set_selection_end(doc->editor->scintilla, sel_end + co_len + eol_len); + sci_set_selection_start(doc->editor->sci, sel_start + co_len + eol_len); + sci_set_selection_end(doc->editor->sci, sel_end + co_len + eol_len); } } } @@ -2368,7 +2368,7 @@ static void auto_multiline(GeanyEditor *editor, gint pos) { - ScintillaObject *sci = editor->scintilla; + ScintillaObject *sci = editor->sci; gint eol_len = editor_get_eol_char_len(editor->document); gint style = SSM(sci, SCI_GETSTYLEAT, pos - 1 - eol_len, 0); gint lexer = SSM(sci, SCI_GETLEXER, 0, 0); @@ -2657,8 +2657,8 @@ have_multiline_comment = TRUE; /* insert three lines one line above of the current position */ - line = sci_get_line_from_position(editor->scintilla, editor_info.click_pos); - pos = sci_get_position_from_line(editor->scintilla, line); + line = sci_get_line_from_position(editor->sci, editor_info.click_pos); + pos = sci_get_position_from_line(editor->sci, line); /* use the indent on the current line but only when comment indentation is used * and we don't have multi line comment characters */ @@ -2674,13 +2674,13 @@ text = g_strdup("\n\n\n"); text_len = 3; } - sci_insert_text(editor->scintilla, pos, text); + sci_insert_text(editor->sci, pos, text); g_free(text); /* select the inserted lines for commenting */ - sci_set_selection_start(editor->scintilla, pos); - sci_set_selection_end(editor->scintilla, pos + text_len); + sci_set_selection_start(editor->sci, pos); + sci_set_selection_end(editor->sci, pos + text_len); editor_do_comment(doc, -1, TRUE, FALSE); @@ -2693,9 +2693,9 @@ else pos += strlen(indent); - sci_set_current_position(editor->scintilla, pos, TRUE); + sci_set_current_position(editor->sci, pos, TRUE); /* reset the selection */ - sci_set_anchor(editor->scintilla, pos); + sci_set_anchor(editor->sci, pos); } @@ -2729,7 +2729,7 @@ { /* creates and inserts one tab or whitespace of the amount of the tab width */ gchar *text = get_whitespace(editor_prefs.tab_width, ! editor->use_tabs); - sci_add_text(editor->scintilla, text); + sci_add_text(editor->sci, text); g_free(text); } @@ -2870,18 +2870,18 @@ { /* skip the first line or if the indentation of the previous and current line are equal */ if (i == 0 || - SSM(doc->editor->scintilla, SCI_GETLINEINDENTATION, i - 1, 0) == - SSM(doc->editor->scintilla, SCI_GETLINEINDENTATION, i, 0)) + SSM(doc->editor->sci, SCI_GETLINEINDENTATION, i - 1, 0) == + SSM(doc->editor->sci, SCI_GETLINEINDENTATION, i, 0)) continue; - sel_start = SSM(doc->editor->scintilla, SCI_POSITIONFROMLINE, i, 0); - sel_end = SSM(doc->editor->scintilla, SCI_GETLINEINDENTPOSITION, i, 0); + sel_start = SSM(doc->editor->sci, SCI_POSITIONFROMLINE, i, 0); + sel_end = SSM(doc->editor->sci, SCI_GETLINEINDENTPOSITION, i, 0); if (sel_start < sel_end) { - SSM(doc->editor->scintilla, SCI_SETSEL, sel_start, sel_end); - sci_replace_sel(doc->editor->scintilla, ""); + SSM(doc->editor->sci, SCI_SETSEL, sel_start, sel_end); + sci_replace_sel(doc->editor->sci, ""); } - sci_insert_text(doc->editor->scintilla, sel_start, indent); + sci_insert_text(doc->editor->sci, sel_start, indent); } } @@ -2895,7 +2895,7 @@ g_return_if_fail(doc != NULL); - sci = doc->editor->scintilla; + sci = doc->editor->sci; first_sel_start = sci_get_selection_start(sci); first_sel_end = sci_get_selection_end(sci); @@ -2943,33 +2943,33 @@ g_return_if_fail(doc != NULL); - sel_start = sci_get_selection_start(doc->editor->scintilla); - sel_end = sci_get_selection_end(doc->editor->scintilla); + sel_start = sci_get_selection_start(doc->editor->sci); + sel_end = sci_get_selection_end(doc->editor->sci); - first_line = sci_get_line_from_position(doc->editor->scintilla, sel_start); + first_line = sci_get_line_from_position(doc->editor->sci, sel_start); /* Find the last line with chars selected (not EOL char) */ - last_line = sci_get_line_from_position(doc->editor->scintilla, sel_end - editor_get_eol_char_len(doc)); + last_line = sci_get_line_from_position(doc->editor->sci, sel_end - editor_get_eol_char_len(doc)); last_line = MAX(first_line, last_line); if (pos == -1) pos = sel_start; - SSM(doc->editor->scintilla, SCI_BEGINUNDOACTION, 0, 0); + SSM(doc->editor->sci, SCI_BEGINUNDOACTION, 0, 0); for (i = first_line; i <= last_line; i++) { - indentation_end = SSM(doc->editor->scintilla, SCI_GETLINEINDENTPOSITION, i, 0); + indentation_end = SSM(doc->editor->sci, SCI_GETLINEINDENTPOSITION, i, 0); if (decrease) { - line_start = SSM(doc->editor->scintilla, SCI_POSITIONFROMLINE, i, 0); + line_start = SSM(doc->editor->sci, SCI_POSITIONFROMLINE, i, 0); /* searching backwards for a space to remove */ - while (sci_get_char_at(doc->editor->scintilla, indentation_end) != ' ' && indentation_end > line_start) + while (sci_get_char_at(doc->editor->sci, indentation_end) != ' ' && indentation_end > line_start) indentation_end--; - if (sci_get_char_at(doc->editor->scintilla, indentation_end) == ' ') + if (sci_get_char_at(doc->editor->sci, indentation_end) == ' ') { - SSM(doc->editor->scintilla, SCI_SETSEL, indentation_end, indentation_end + 1); - sci_replace_sel(doc->editor->scintilla, ""); + SSM(doc->editor->sci, SCI_SETSEL, indentation_end, indentation_end + 1); + sci_replace_sel(doc->editor->sci, ""); count--; if (i == first_line) first_line_offset = -1; @@ -2977,7 +2977,7 @@ } else { - sci_insert_text(doc->editor->scintilla, indentation_end, " "); + sci_insert_text(doc->editor->sci, indentation_end, " "); count++; if (i == first_line) first_line_offset = 1; @@ -2990,15 +2990,15 @@ gint start = sel_start + first_line_offset; if (first_line_offset < 0) start = MAX(sel_start + first_line_offset, - SSM(doc->editor->scintilla, SCI_POSITIONFROMLINE, first_line, 0)); + SSM(doc->editor->sci, SCI_POSITIONFROMLINE, first_line, 0)); - sci_set_selection_start(doc->editor->scintilla, start); - sci_set_selection_end(doc->editor->scintilla, sel_end + count); + sci_set_selection_start(doc->editor->sci, start); + sci_set_selection_end(doc->editor->sci, sel_end + count); } else - sci_set_current_position(doc->editor->scintilla, pos + count, FALSE); + sci_set_current_position(doc->editor->sci, pos + count, FALSE); - SSM(doc->editor->scintilla, SCI_ENDUNDOACTION, 0, 0); + SSM(doc->editor->sci, SCI_ENDUNDOACTION, 0, 0); } @@ -3018,18 +3018,18 @@ if (doc == NULL) return NULL; - if (sci_get_lines_selected(doc->editor->scintilla) == 1) + if (sci_get_lines_selected(doc->editor->sci) == 1) { - gint len = sci_get_selected_text_length(doc->editor->scintilla); + gint len = sci_get_selected_text_length(doc->editor->sci); s = g_malloc(len + 1); - sci_get_selected_text(doc->editor->scintilla, s); + sci_get_selected_text(doc->editor->sci, s); } - else if (sci_get_lines_selected(doc->editor->scintilla) == 0 && use_current_word) + else if (sci_get_lines_selected(doc->editor->sci) == 0 && use_current_word) { /* use the word at current cursor position */ gchar word[GEANY_MAX_WORD_LENGTH]; - editor_find_current_word(doc->editor->scintilla, -1, word, sizeof(word), wordchars); + editor_find_current_word(doc->editor->sci, -1, word, sizeof(word), wordchars); if (word[0] != '\0') s = g_strdup(word); } @@ -3061,11 +3061,11 @@ * so it appears at percent_of_view. */ void editor_display_current_line(GeanyEditor *editor, gfloat percent_of_view) { - ScintillaObject *sci = editor->scintilla; + ScintillaObject *sci = editor->sci; gint line = sci_get_current_line(sci); /* unfold maybe folded results */ - sci_ensure_line_is_visible(editor->scintilla, line); + sci_ensure_line_is_visible(editor->sci, line); /* scroll the line if it's off screen */ if (! editor_line_in_view(sci, line)) @@ -3085,13 +3085,13 @@ g_return_if_fail(editor != NULL); - last_pos = sci_get_length(editor->scintilla); + last_pos = sci_get_length(editor->sci); if (last_pos > 0) { - sci_start_styling(editor->scintilla, 0, INDIC2_MASK); - sci_set_styling(editor->scintilla, last_pos, 0); + sci_start_styling(editor->sci, 0, INDIC2_MASK); + sci_set_styling(editor->sci, last_pos, 0); } - sci_marker_delete_all(editor->scintilla, 0); /* remove the yellow error line marker */ + sci_marker_delete_all(editor->sci, 0); /* remove the yellow error line marker */ } @@ -3112,17 +3112,17 @@ if (editor == NULL) return; - start = sci_get_position_from_line(editor->scintilla, line); - end = sci_get_position_from_line(editor->scintilla, line + 1); + start = sci_get_position_from_line(editor->sci, line); + end = sci_get_position_from_line(editor->sci, line + 1); /* skip blank lines */ if ((start + 1) == end || - sci_get_line_length(editor->scintilla, line) == editor_get_eol_char_len(editor->document)) + sci_get_line_length(editor->sci, line) == editor_get_eol_char_len(editor->document)) return; /* don't set the indicator on whitespace */ len = end - start; - linebuf = sci_get_line(editor->scintilla, line); + linebuf = sci_get_line(editor->sci, line); while (isspace(linebuf[i])) i++; while (len > 1 && len > i && isspace(linebuf[len-1])) @@ -3152,12 +3152,12 @@ if (editor == NULL || start >= end) return; - current_mask = sci_get_style_at(editor->scintilla, start); + current_mask = sci_get_style_at(editor->sci, start); current_mask &= INDICS_MASK; current_mask |= INDIC2_MASK; - sci_start_styling(editor->scintilla, start, INDIC2_MASK); - sci_set_styling(editor->scintilla, end - start, current_mask); + sci_start_styling(editor->sci, start, INDIC2_MASK); + sci_set_styling(editor->sci, end - start, current_mask); } @@ -3167,26 +3167,26 @@ { g_return_if_fail(doc != NULL); - if (sci_can_copy(doc->editor->scintilla)) + if (sci_can_copy(doc->editor->sci)) { - gint start = sci_get_selection_start(doc->editor->scintilla); + gint start = sci_get_selection_start(doc->editor->sci); const gchar *replacement = colour; - if (sci_get_char_at(doc->editor->scintilla, start) == '0' && - sci_get_char_at(doc->editor->scintilla, start + 1) == 'x') + if (sci_get_char_at(doc->editor->sci, start) == '0' && + sci_get_char_at(doc->editor->sci, start + 1) == 'x') { - sci_set_selection_start(doc->editor->scintilla, start + 2); - sci_set_selection_end(doc->editor->scintilla, start + 8); + sci_set_selection_start(doc->editor->sci, start + 2); + sci_set_selection_end(doc->editor->sci, start + 8); replacement++; /* skip the leading "0x" */ } - else if (sci_get_char_at(doc->editor->scintilla, start - 1) == '#') + else if (sci_get_char_at(doc->editor->sci, start - 1) == '#') { /* double clicking something like #00ffff may only select 00ffff because of wordchars */ replacement++; /* so skip the '#' to only replace the colour value */ } - sci_replace_sel(doc->editor->scintilla, replacement); + sci_replace_sel(doc->editor->sci, replacement); } else - sci_add_text(doc->editor->scintilla, colour); + sci_add_text(doc->editor->sci, colour); } @@ -3195,7 +3195,7 @@ if (doc == NULL) return ""; - switch (sci_get_eol_mode(doc->editor->scintilla)) + switch (sci_get_eol_mode(doc->editor->sci)) { case SC_EOL_CRLF: return _("Win (CRLF)"); break; case SC_EOL_CR: return _("Mac (CR)"); break; @@ -3210,7 +3210,7 @@ if (doc == NULL) return 0; - switch (sci_get_eol_mode(doc->editor->scintilla)) + switch (sci_get_eol_mode(doc->editor->sci)) { case SC_EOL_CRLF: return 2; break; default: return 1; break; @@ -3224,7 +3224,7 @@ if (doc == NULL) return ""; - switch (sci_get_eol_mode(doc->editor->scintilla)) + switch (sci_get_eol_mode(doc->editor->sci)) { case SC_EOL_CRLF: return "\r\n"; break; case SC_EOL_CR: return "\r"; break; @@ -3239,19 +3239,19 @@ if (doc == NULL || ! editor_prefs.folding) return; - lines = sci_get_line_count(doc->editor->scintilla); - first = sci_get_first_visible_line(doc->editor->scintilla); + lines = sci_get_line_count(doc->editor->sci); + first = sci_get_first_visible_line(doc->editor->sci); for (i = 0; i < lines; i++) { - gint level = sci_get_fold_level(doc->editor->scintilla, i); + gint level = sci_get_fold_level(doc->editor->sci, i); if (level & SC_FOLDLEVELHEADERFLAG) { - if (sci_get_fold_expanded(doc->editor->scintilla, i) == want_fold) - sci_toggle_fold(doc->editor->scintilla, i); + if (sci_get_fold_expanded(doc->editor->sci, i) == want_fold) + sci_toggle_fold(doc->editor->sci, i); } } - editor_scroll_to_line(doc->editor->scintilla, first, 0.0F); + editor_scroll_to_line(doc->editor->sci, first, 0.0F); } @@ -3277,31 +3277,31 @@ if (doc == NULL) return; - sci_start_undo_action(doc->editor->scintilla); - tab_len = sci_get_tab_width(doc->editor->scintilla); + sci_start_undo_action(doc->editor->sci); + tab_len = sci_get_tab_width(doc->editor->sci); ttf.chrg.cpMin = 0; - ttf.chrg.cpMax = sci_get_length(doc->editor->scintilla); + ttf.chrg.cpMax = sci_get_length(doc->editor->sci); ttf.lpstrText = (gchar*) "\t"; while (TRUE) { - search_pos = sci_find_text(doc->editor->scintilla, SCFIND_MATCHCASE, &ttf); + search_pos = sci_find_text(doc->editor->sci, SCFIND_MATCHCASE, &ttf); if (search_pos == -1) break; - pos_in_line = sci_get_col_from_position(doc->editor->scintilla,search_pos); + pos_in_line = sci_get_col_from_position(doc->editor->sci,search_pos); current_tab_true_length = tab_len - (pos_in_line % tab_len); tab_str = g_strnfill(current_tab_true_length, ' '); - sci_target_start(doc->editor->scintilla, search_pos); - sci_target_end(doc->editor->scintilla, search_pos + 1); - sci_target_replace(doc->editor->scintilla, tab_str, FALSE); + sci_target_start(doc->editor->sci, search_pos); + sci_target_end(doc->editor->sci, search_pos + 1); + sci_target_replace(doc->editor->sci, tab_str, FALSE); /* next search starts after replacement */ ttf.chrg.cpMin = search_pos + current_tab_true_length - 1; /* update end of range now text has changed */ ttf.chrg.cpMax += current_tab_true_length - 1; g_free(tab_str); } - sci_end_undo_action(doc->editor->scintilla); + sci_end_undo_action(doc->editor->sci); } @@ -3317,7 +3317,7 @@ return; if (tab_len_f < 0.0) - tab_len_f = sci_get_tab_width(doc->editor->scintilla); + tab_len_f = sci_get_tab_width(doc->editor->sci); if (! dialogs_show_input_numeric( _("Enter Tab Width"), @@ -3328,79 +3328,79 @@ } tab_len = (gint) tab_len_f; - sci_start_undo_action(doc->editor->scintilla); + sci_start_undo_action(doc->editor->sci); ttf.chrg.cpMin = 0; - ttf.chrg.cpMax = sci_get_length(doc->editor->scintilla); + ttf.chrg.cpMax = sci_get_length(doc->editor->sci); ttf.lpstrText = g_strnfill(tab_len, ' '); while (TRUE) { - search_pos = sci_find_text(doc->editor->scintilla, SCFIND_MATCHCASE, &ttf); + search_pos = sci_find_text(doc->editor->sci, SCFIND_MATCHCASE, &ttf); if (search_pos == -1) break; - sci_target_start(doc->editor->scintilla, search_pos); - sci_target_end(doc->editor->scintilla, search_pos + tab_len); - sci_target_replace(doc->editor->scintilla, "\t", FALSE); + sci_target_start(doc->editor->sci, search_pos); + sci_target_end(doc->editor->sci, search_pos + tab_len); + sci_target_replace(doc->editor->sci, "\t", FALSE); ttf.chrg.cpMin = search_pos; /* update end of range now text has changed */ ttf.chrg.cpMax -= tab_len - 1; } - sci_end_undo_action(doc->editor->scintilla); + sci_end_undo_action(doc->editor->sci); g_free(ttf.lpstrText); } void editor_strip_line_trailing_spaces(GeanyDocument *doc, gint line) { - gint line_start = sci_get_position_from_line(doc->editor->scintilla, line); - gint line_end = sci_get_line_end_position(doc->editor->scintilla, line); + gint line_start = sci_get_position_from_line(doc->editor->sci, line); + gint line_end = sci_get_line_end_position(doc->editor->sci, line); gint i = line_end - 1; - gchar ch = sci_get_char_at(doc->editor->scintilla, i); + gchar ch = sci_get_char_at(doc->editor->sci, i); while ((i >= line_start) && ((ch == ' ') || (ch == '\t'))) { i--; - ch = sci_get_char_at(doc->editor->scintilla, i); + ch = sci_get_char_at(doc->editor->sci, i); } if (i < (line_end-1)) { - sci_target_start(doc->editor->scintilla, i + 1); - sci_target_end(doc->editor->scintilla, line_end); - sci_target_replace(doc->editor->scintilla, "", FALSE); + sci_target_start(doc->editor->sci, i + 1); + sci_target_end(doc->editor->sci, line_end); + sci_target_replace(doc->editor->sci, "", FALSE); } } void editor_strip_trailing_spaces(GeanyDocument *doc) { - gint max_lines = sci_get_line_count(doc->editor->scintilla); + gint max_lines = sci_get_line_count(doc->editor->sci); gint line; - sci_start_undo_action(doc->editor->scintilla); + sci_start_undo_action(doc->editor->sci); for (line = 0; line < max_lines; line++) { editor_strip_line_trailing_spaces(doc, line); } - sci_end_undo_action(doc->editor->scintilla); + sci_end_undo_action(doc->editor->sci); } void editor_ensure_final_newline(GeanyDocument *doc) { - gint max_lines = sci_get_line_count(doc->editor->scintilla); + gint max_lines = sci_get_line_count(doc->editor->sci); gboolean append_newline = (max_lines == 1); - gint end_document = sci_get_position_from_line(doc->editor->scintilla, max_lines); + gint end_document = sci_get_position_from_line(doc->editor->sci, max_lines); if (max_lines > 1) { - append_newline = end_document > sci_get_position_from_line(doc->editor->scintilla, max_lines - 1); + append_newline = end_document > sci_get_position_from_line(doc->editor->sci, max_lines - 1); } if (append_newline) { const gchar *eol = "\n"; - switch (sci_get_eol_mode(doc->editor->scintilla)) + switch (sci_get_eol_mode(doc->editor->sci)) { case SC_EOL_CRLF: eol = "\r\n"; @@ -3409,7 +3409,7 @@ eol = "\r"; break; } - sci_insert_text(doc->editor->scintilla, end_document, eol); + sci_insert_text(doc->editor->sci, end_document, eol); } } @@ -3428,16 +3428,16 @@ pango_font_description_free(pfd); for (style = 0; style <= 127; style++) - sci_set_font(editor->scintilla, style, font_name, size); + sci_set_font(editor->sci, style, font_name, size); /* line number and braces */ - sci_set_font(editor->scintilla, STYLE_LINENUMBER, font_name, size); - sci_set_font(editor->scintilla, STYLE_BRACELIGHT, font_name, size); - sci_set_font(editor->scintilla, STYLE_BRACEBAD, font_name, size); + sci_set_font(editor->sci, STYLE_LINENUMBER, font_name, size); + sci_set_font(editor->sci, STYLE_BRACELIGHT, font_name, size); + sci_set_font(editor->sci, STYLE_BRACEBAD, font_name, size); g_free(font_name); /* zoom to 100% to prevent confusion */ - sci_zoom_off(editor->scintilla); + sci_zoom_off(editor->sci); } @@ -3446,7 +3446,7 @@ g_return_if_fail(editor != NULL); editor->line_wrapping = wrap; - sci_set_lines_wrapped(editor->scintilla, wrap); + sci_set_lines_wrapped(editor->sci, wrap); } @@ -3455,9 +3455,9 @@ g_return_if_fail(editor != NULL); editor->use_tabs = use_tabs; - sci_set_use_tabs(editor->scintilla, use_tabs); + sci_set_use_tabs(editor->sci, use_tabs); /* remove indent spaces on backspace, if using spaces to indent */ - SSM(editor->scintilla, SCI_SETBACKSPACEUNINDENTS, ! use_tabs, 0); + SSM(editor->sci, SCI_SETBACKSPACEUNINDENTS, ! use_tabs, 0); } @@ -3473,18 +3473,18 @@ if (mark) { - gint line = sci_get_line_from_position(editor->scintilla, pos); + gint line = sci_get_line_from_position(editor->sci, pos); /* mark the tag with the yellow arrow */ - sci_marker_delete_all(editor->scintilla, 0); - sci_set_marker_at_line(editor->scintilla, line, TRUE, 0); + sci_marker_delete_all(editor->sci, 0); + sci_set_marker_at_line(editor->sci, line, TRUE, 0); } - sci_goto_pos(editor->scintilla, pos, TRUE); + sci_goto_pos(editor->sci, pos, TRUE); editor->scroll_percent = 0.25F; /* finally switch to the page */ - page_num = gtk_notebook_page_num(GTK_NOTEBOOK(main_widgets.notebook), GTK_WIDGET(editor->scintilla)); + page_num = gtk_notebook_page_num(GTK_NOTEBOOK(main_widgets.notebook), GTK_WIDGET(editor->sci)); gtk_notebook_set_current_page(GTK_NOTEBOOK(main_widgets.notebook), page_num); return TRUE; @@ -3499,7 +3499,7 @@ if (event->state & GDK_MOD1_MASK) { GeanyDocument *doc = user_data; - sci_cmd(doc->editor->scintilla, (event->direction == GDK_SCROLL_DOWN) ? SCI_PAGEDOWN : SCI_PAGEUP); + sci_cmd(doc->editor->sci, (event->direction == GDK_SCROLL_DOWN) ? SCI_PAGEDOWN : SCI_PAGEUP); return TRUE; } @@ -3525,7 +3525,7 @@ if (DOCUMENT(doc)->colourise_needed) { - editor_colourise(doc->editor->scintilla); + editor_colourise(doc->editor->sci); DOCUMENT(doc)->colourise_needed = FALSE; } return FALSE; /* propagate event */ @@ -3620,7 +3620,7 @@ editor->scroll_percent = -1.0F; editor->line_breaking = FALSE; - editor->scintilla = create_new_sci(doc); + editor->sci = create_new_sci(doc); editor_set_font(editor, interface_prefs.editor_font); return editor; } Modified: branches/editor-struct/src/editor.h =================================================================== --- branches/editor-struct/src/editor.h 2008-07-13 11:51:00 UTC (rev 2775) +++ branches/editor-struct/src/editor.h 2008-07-14 11:13:54 UTC (rev 2776) @@ -102,13 +102,13 @@ /** Editor-owned fields for each document. */ typedef struct GeanyEditor { - GeanyDocument *document; /**< The document associated with the editor. */ - ScintillaObject *scintilla; /**< The Scintilla editor @c GtkWidget. */ + GeanyDocument *document; /**< The document associated with the editor. */ + ScintillaObject *sci; /**< The Scintilla editor @c GtkWidget. */ gboolean line_wrapping; /**< @c TRUE if line wrapping is enabled. */ gboolean auto_indent; /**< @c TRUE if auto-indentation is enabled. */ /** Percentage to scroll view by on paint, if positive. */ gfloat scroll_percent; - gboolean use_tabs; /**< @c TRUE if tabs are used for indentation. */ + gboolean use_tabs; /**< @c TRUE if tabs are used for indentation. */ gboolean line_breaking; /**< Whether to split long lines as you type. */ } GeanyEditor; Modified: branches/editor-struct/src/filetypes.c =================================================================== --- branches/editor-struct/src/filetypes.c 2008-07-13 11:51:00 UTC (rev 2775) +++ branches/editor-struct/src/filetypes.c 2008-07-14 11:13:54 UTC (rev 2776) @@ -667,7 +667,7 @@ if (doc == NULL) return filetypes[GEANY_FILETYPES_NONE]; - line = sci_get_line(doc->editor->scintilla, 0); + line = sci_get_line(doc->editor->sci, 0); ft = filetypes_detect_from_file_internal(doc->file_name, line); g_free(line); return ft; Modified: branches/editor-struct/src/keybindings.c =================================================================== --- branches/editor-struct/src/keybindings.c 2008-07-13 11:51:00 UTC (rev 2775) +++ branches/editor-struct/src/keybindings.c 2008-07-14 11:13:54 UTC (rev 2776) @@ -816,9 +816,9 @@ GtkWidget *focusw = gtk_window_get_focus(GTK_WINDOW(main_widgets.window)); /* keybinding only valid when scintilla widget has focus */ - if (doc != NULL && focusw == GTK_WIDGET(doc->editor->scintilla)) + if (doc != NULL && focusw == GTK_WIDGET(doc->editor->sci)) { - ScintillaObject *sci = doc->editor->scintilla; + ScintillaObject *sci = doc->editor->sci; gint pos = sci_get_current_position(sci); if (editor_prefs.complete_snippets) @@ -1174,9 +1174,9 @@ if (doc == NULL) return FALSE; - pos = sci_get_current_position(doc->editor->scintilla); + pos = sci_get_current_position(doc->editor->sci); - editor_find_current_word(doc->editor->scintilla, pos, + editor_find_current_word(doc->editor->sci, pos, editor_info.current_word, GEANY_MAX_WORD_LENGTH, NULL); if (*editor_info.current_word == 0) @@ -1209,7 +1209,7 @@ { GeanyDocument *doc = document_get_current(); if (doc != NULL) - gtk_widget_grab_focus(GTK_WIDGET(doc->editor->scintilla)); + gtk_widget_grab_focus(GTK_WIDGET(doc->editor->sci)); break; } case GEANY_KEYS_FOCUS_SCRIBBLE: @@ -1284,7 +1284,7 @@ if (doc == NULL) return; - sci = GTK_WIDGET(doc->editor->scintilla); + sci = GTK_WIDGET(doc->editor->sci); switch (key_id) { @@ -1329,14 +1329,14 @@ if (doc == NULL) return; - pos = sci_get_current_position(doc->editor->scintilla); - if (! utils_isbrace(sci_get_char_at(doc->editor->scintilla, pos), TRUE)) + pos = sci_get_current_position(doc->editor->sci); + if (! utils_isbrace(sci_get_char_at(doc->editor->sci, pos), TRUE)) pos--; /* set pos to the brace */ - new_pos = sci_find_bracematch(doc->editor->scintilla, pos); + new_pos = sci_find_bracematch(doc->editor->sci, pos); if (new_pos != -1) { /* set the cursor at the brace */ - sci_set_current_position(doc->editor->scintilla, new_pos, FALSE); + sci_set_current_position(doc->editor->sci, new_pos, FALSE); editor_display_current_line(doc->editor, 0.5F); } } @@ -1361,10 +1361,10 @@ on_paste1_activate(NULL, NULL); break; case GEANY_KEYS_CLIPBOARD_COPYLINE: - sci_cmd(doc->editor->scintilla, SCI_LINECOPY); + sci_cmd(doc->editor->sci, SCI_LINECOPY); break; case GEANY_KEYS_CLIPBOARD_CUTLINE: - sci_cmd(doc->editor->scintilla, SCI_LINECUT); + sci_cmd(doc->editor->sci, SCI_LINECUT); break; } } @@ -1379,7 +1379,7 @@ if (doc == NULL) return; - cur_line = sci_get_current_line(doc->editor->scintilla); + cur_line = sci_get_current_line(doc->editor->sci); switch (key_id) { @@ -1397,29 +1397,29 @@ return; case GEANY_KEYS_GOTO_TOGGLEMARKER: { - gboolean set = sci_is_marker_set_at_line(doc->editor->scintilla, cur_line, 1); + gboolean set = sci_is_marker_set_at_line(doc->editor->sci, cur_line, 1); - sci_set_marker_at_line(doc->editor->scintilla, cur_line, ! set, 1); + sci_set_marker_at_line(doc->editor->sci, cur_line, ! set, 1); return; } case GEANY_KEYS_GOTO_NEXTMARKER: { - gint mline = sci_marker_next(doc->editor->scintilla, cur_line + 1, 1 << 1, TRUE); + gint mline = sci_marker_next(doc->editor->sci, cur_line + 1, 1 << 1, TRUE); if (mline != -1) { - sci_set_current_line(doc->editor->scintilla, mline); + sci_set_current_line(doc->editor->sci, mline); editor_display_current_line(doc->editor, 0.5F); } return; } case GEANY_KEYS_GOTO_PREVIOUSMARKER: { - gint mline = sci_marker_previous(doc->editor->scintilla, cur_line - 1, 1 << 1, TRUE); + gint mline = sci_marker_previous(doc->editor->sci, cur_line - 1, 1 << 1, TRUE); if (mline != -1) { - sci_set_current_line(doc->editor->scintilla, mline); + sci_set_current_line(doc->editor->sci, mline); editor_display_current_line(doc->editor, 0.5F); } return; @@ -1434,7 +1434,7 @@ return; } /* only check editor-sensitive keybindings when editor has focus */ - if (gtk_window_get_focus(GTK_WINDOW(main_widgets.window)) != GTK_WIDGET(doc->editor->scintilla)) + if (gtk_window_get_focus(GTK_WINDOW(main_widgets.window)) != GTK_WIDGET(doc->editor->sci)) { ignore_keybinding = TRUE; return; @@ -1442,10 +1442,10 @@ switch (key_id) { case GEANY_KEYS_GOTO_LINESTART: - sci_cmd(doc->editor->scintilla, editor_prefs.smart_home_key ? SCI_VCHOME : SCI_HOME); + sci_cmd(doc->editor->sci, editor_prefs.smart_home_key ? SCI_VCHOME : SCI_HOME); break; case GEANY_KEYS_GOTO_LINEEND: - sci_cmd(doc->editor->scintilla, SCI_LINEEND); + sci_cmd(doc->editor->sci, SCI_LINEEND); break; } } @@ -1479,7 +1479,7 @@ GtkWidget *focusw = gtk_window_get_focus(GTK_WINDOW(main_widgets.window)); /* edit keybindings only valid when scintilla widget has focus */ - if (doc == NULL || focusw != GTK_WIDGET(doc->editor->scintilla)) + if (doc == NULL || focusw != GTK_WIDGET(doc->editor->sci)) return; switch (key_id) @@ -1491,31 +1491,31 @@ on_redo1_activate(NULL, NULL); break; case GEANY_KEYS_EDITOR_SCROLLTOLINE: - editor_scroll_to_line(doc->editor->scintilla, -1, 0.5F); + editor_scroll_to_line(doc->editor->sci, -1, 0.5F); break; case GEANY_KEYS_EDITOR_SCROLLLINEUP: - sci_cmd(doc->editor->scintilla, SCI_LINESCROLLUP); + sci_cmd(doc->editor->sci, SCI_LINESCROLLUP); break; case GEANY_KEYS_EDITOR_SCROLLLINEDOWN: - sci_cmd(doc->editor->scintilla, SCI_LINESCROLLDOWN); + sci_cmd(doc->editor->sci, SCI_LINESCROLLDOWN); break; case GEANY_KEYS_EDITOR_DUPLICATELINE: - duplicate_lines(doc->editor->scintilla); + duplicate_lines(doc->editor->sci); break; case GEANY_KEYS_EDITOR_DELETELINE: - delete_lines(doc->editor->scintilla); + delete_lines(doc->editor->sci); break; case GEANY_KEYS_EDITOR_TRANSPOSELINE: - sci_cmd(doc->editor->scintilla, SCI_LINETRANSPOSE); + sci_cmd(doc->editor->sci, SCI_LINETRANSPOSE); break; case GEANY_KEYS_EDITOR_AUTOCOMPLETE: - editor_start_auto_complete(doc, sci_get_current_position(doc->editor->scintilla), TRUE); + editor_start_auto_complete(doc, sci_get_current_position(doc->editor->sci), TRUE); break; case GEANY_KEYS_EDITOR_CALLTIP: editor_show_calltip(doc, -1); break; case GEANY_KEYS_EDITOR_MACROLIST: - editor_show_macro_list(doc->editor->scintilla); + editor_show_macro_list(doc->editor->sci); break; case GEANY_KEYS_EDITOR_CONTEXTACTION: if (check_current_word()) @@ -1530,10 +1530,10 @@ switch (kb->key) { case GDK_space: - sci_add_text(doc->editor->scintilla, " "); + sci_add_text(doc->editor->sci, " "); break; case GDK_Tab: - sci_cmd(doc->editor->scintilla, SCI_TAB); + sci_cmd(doc->editor->sci, SCI_TAB); break; default: break; @@ -1551,7 +1551,7 @@ GtkWidget *focusw = gtk_window_get_focus(GTK_WINDOW(main_widgets.window)); /* keybindings only valid when scintilla widget has focus */ - if (doc == NULL || focusw != GTK_WIDGET(doc->editor->scintilla)) + if (doc == NULL || focusw != GTK_WIDGET(doc->editor->sci)) return; switch (key_id) @@ -1616,7 +1616,7 @@ } /* keybindings only valid when scintilla widget has focus */ - if (doc == NULL || focusw != GTK_WIDGET(doc->editor->scintilla)) + if (doc == NULL || focusw != GTK_WIDGET(doc->editor->sci)) return; switch (key_id) @@ -1625,13 +1625,13 @@ on_menu_select_all1_activate(NULL, NULL); break; case GEANY_KEYS_SELECT_WORD: - editor_select_word(doc->editor->scintilla); + editor_select_word(doc->editor->sci); break; case GEANY_KEYS_SELECT_LINE: - editor_select_lines(doc->editor->scintilla, FALSE); + editor_select_lines(doc->editor->sci, FALSE); break; case GEANY_KEYS_SELECT_PARAGRAPH: - editor_select_paragraph(doc->editor->scintilla); + editor_select_paragraph(doc->editor->sci); break; } } @@ -1669,8 +1669,8 @@ case GEANY_KEYS_DOCUMENT_TOGGLEFOLD: if (editor_prefs.folding) { - gint line = sci_get_current_line(doc->editor->scintilla); - sci_toggle_fold(doc->editor->scintilla, line); + gint line = sci_get_current_line(doc->editor->sci); + sci_toggle_fold(doc->editor->sci, line); break; } } @@ -1684,7 +1684,7 @@ GtkWidget *focusw = gtk_window_get_focus(GTK_WINDOW(main_widgets.window)); /* keybindings only valid when scintilla widget has focus */ - if (doc == NULL || focusw != GTK_WIDGET(doc->editor->scintilla)) return; + if (doc == NULL || focusw != GTK_WIDGET(doc->editor->sci)) return; switch (key_id) { Modified: branches/editor-struct/src/keyfile.c =================================================================== --- branches/editor-struct/src/keyfile.c 2008-07-13 11:51:00 UTC (rev 2775) +++ branches/editor-struct/src/keyfile.c 2008-07-14 11:13:54 UTC (rev 2776) @@ -144,7 +144,7 @@ ft = filetypes[GEANY_FILETYPES_NONE]; fname = g_strdup_printf("%d;%s;%d;%d;%d;%d;%d;%s;", - sci_get_current_position(doc->editor->scintilla), + sci_get_current_position(doc->editor->sci), ft->name, doc->readonly, encodings_get_idx_from_charset(doc->encoding), Modified: branches/editor-struct/src/main.c =================================================================== --- branches/editor-struct/src/main.c 2008-07-13 11:51:00 UTC (rev 2775) +++ branches/editor-struct/src/main.c 2008-07-14 11:13:54 UTC (rev 2776) @@ -910,7 +910,7 @@ ui_save_buttons_toggle(FALSE); doc = document_get_current(); - gtk_widget_grab_focus(GTK_WIDGET(doc->editor->scintilla)); + gtk_widget_grab_focus(GTK_WIDGET(doc->editor->sci)); treeviews_select_openfiles_item(doc); build_menu_update(doc); treeviews_update_tag_list(doc, FALSE); Modified: branches/editor-struct/src/navqueue.c =================================================================== --- branches/editor-struct/src/navqueue.c 2008-07-13 11:51:00 UTC (rev 2775) +++ branches/editor-struct/src/navqueue.c 2008-07-14 11:13:54 UTC (rev 2776) @@ -151,12 +151,12 @@ g_return_val_if_fail(new_doc != NULL, FALSE); g_return_val_if_fail(line >= 1, FALSE); - pos = sci_get_position_from_line(new_doc->editor->scintilla, line - 1); + pos = sci_get_position_from_line(new_doc->editor->sci, line - 1); /* first add old file position */ if (old_doc != NULL && old_doc->file_name) { - gint cur_pos = sci_get_current_position(old_doc->editor->scintilla); + gint cur_pos = sci_get_current_position(old_doc->editor->sci); add_new_position(old_doc->file_name, cur_pos); } Modified: branches/editor-struct/src/notebook.c =================================================================== --- branches/editor-struct/src/notebook.c 2008-07-13 11:51:00 UTC (rev 2775) +++ branches/editor-struct/src/notebook.c 2008-07-14 11:13:54 UTC (rev 2776) @@ 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: [2775] trunk
by eht16＠users.sourceforge.net 13 Jul '08

13 Jul '08

Revision: 2775 http://geany.svn.sourceforge.net/geany/?rev=2775&view=rev Author: eht16 Date: 2008-07-13 04:51:00 -0700 (Sun, 13 Jul 2008) Log Message: ----------- Add preferences for year, date and datetime format of the corresponding template wildcards to make them more flexible. Modified Paths: -------------- trunk/ChangeLog trunk/doc/geany.html trunk/doc/geany.txt trunk/geany.glade trunk/src/editor.c trunk/src/interface.c trunk/src/keyfile.c trunk/src/plugindata.h trunk/src/prefs.c trunk/src/templates.c trunk/src/templates.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-07-13 10:56:21 UTC (rev 2774) +++ trunk/ChangeLog 2008-07-13 11:51:00 UTC (rev 2775) @@ -4,6 +4,11 @@ Add support to use template wildcards in snippets. * src/editor.c, src/templates.c, src/templates.h: Use templates_replace_all() also for snippet completion. + * geany.glade, doc/geany.html, doc/geany.txt, src/editor.c, + src/interface.c, src/keyfile.c, src/plugindata.h, src/prefs.c, + src/templates.c, src/templates.h: + Add preferences for year, date and datetime format of the + corresponding template wildcards to make them more flexible. 2008-07-12 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/doc/geany.html =================================================================== --- trunk/doc/geany.html 2008-07-13 10:56:21 UTC (rev 2774) +++ trunk/doc/geany.html 2008-07-13 11:51:00 UTC (rev 2775) @@ -6,7 +6,7 @@ <meta name="generator" content="Docutils 0.4: http://docutils.sourceforge.net/" /> <title>Geany</title> <meta name="authors" content="Enrico Tröger Nick Treleaven Frank Lanitz" /> -<meta name="date" content="2008-06-24" /> +<meta name="date" content="2008-07-13" /> <style type="text/css"> /* @@ -139,7 +139,7 @@ <br />Nick Treleaven <br />Frank Lanitz</td></tr> <tr><th class="docinfo-name">Date:</th> -<td>2008-06-24</td></tr> +<td>2008-07-13</td></tr> <tr><th class="docinfo-name">Version:</th> <td>0.15</td></tr> </tbody> @@ -153,233 +153,233 @@ <div class="contents topic"> <p class="topic-title first"><a id="contents" name="contents">Contents</a></p> <ul class="simple"> -<li><a class="reference" href="#introduction" id="id5" name="id5">Introduction</a><ul> -<li><a class="reference" href="#about-geany" id="id6" name="id6">About Geany</a></li> -<li><a class="reference" href="#where-to-get-it" id="id7" name="id7">Where to get it</a></li> -<li><a class="reference" href="#license" id="id8" name="id8">License</a></li> -<li><a class="reference" href="#about-this-document" id="id9" name="id9">About this document</a></li> +<li><a class="reference" href="#introduction" id="id9" name="id9">Introduction</a><ul> +<li><a class="reference" href="#about-geany" id="id10" name="id10">About Geany</a></li> +<li><a class="reference" href="#where-to-get-it" id="id11" name="id11">Where to get it</a></li> +<li><a class="reference" href="#license" id="id12" name="id12">License</a></li> +<li><a class="reference" href="#about-this-document" id="id13" name="id13">About this document</a></li> </ul> </li> -<li><a class="reference" href="#installation" id="id10" name="id10">Installation</a><ul> -<li><a class="reference" href="#requirements" id="id11" name="id11">Requirements</a></li> -<li><a class="reference" href="#source-compilation" id="id12" name="id12">Source compilation</a></li> -<li><a class="reference" href="#binary-packages" id="id13" name="id13">Binary packages</a></li> +<li><a class="reference" href="#installation" id="id14" name="id14">Installation</a><ul> +<li><a class="reference" href="#requirements" id="id15" name="id15">Requirements</a></li> +<li><a class="reference" href="#source-compilation" id="id16" name="id16">Source compilation</a></li> +<li><a class="reference" href="#binary-packages" id="id17" name="id17">Binary packages</a></li> </ul> </li> -<li><a class="reference" href="#usage" id="id14" name="id14">Usage</a><ul> -<li><a class="reference" href="#getting-started" id="id15" name="id15">Getting started</a></li> -<li><a class="reference" href="#command-line-options" id="id16" name="id16">Command line options</a></li> -<li><a class="reference" href="#general" id="id17" name="id17">General</a><ul> -<li><a class="reference" href="#startup" id="id18" name="id18">Startup</a></li> -<li><a class="reference" href="#opening-files-from-the-command-line-in-a-running-instance" id="id19" name="id19">Opening files from the command-line in a running instance</a></li> -<li><a class="reference" href="#virtual-terminal-emulator-widget-vte" id="id20" name="id20">Virtual terminal emulator widget (VTE)</a></li> -<li><a class="reference" href="#defining-own-widget-styles-using-gtkrc-2-0" id="id21" name="id21">Defining own widget styles using .gtkrc-2.0</a></li> +<li><a class="reference" href="#usage" id="id18" name="id18">Usage</a><ul> +<li><a class="reference" href="#getting-started" id="id19" name="id19">Getting started</a></li> +<li><a class="reference" href="#command-line-options" id="id20" name="id20">Command line options</a></li> +<li><a class="reference" href="#general" id="id21" name="id21">General</a><ul> +<li><a class="reference" href="#startup" id="id22" name="id22">Startup</a></li> +<li><a class="reference" href="#opening-files-from-the-command-line-in-a-running-instance" id="id23" name="id23">Opening files from the command-line in a running instance</a></li> +<li><a class="reference" href="#virtual-terminal-emulator-widget-vte" id="id24" name="id24">Virtual terminal emulator widget (VTE)</a></li> +<li><a class="reference" href="#defining-own-widget-styles-using-gtkrc-2-0" id="id25" name="id25">Defining own widget styles using .gtkrc-2.0</a></li> </ul> </li> -<li><a class="reference" href="#documents" id="id22" name="id22">Documents</a><ul> -<li><a class="reference" href="#switching-between-documents" id="id23" name="id23">Switching between documents</a></li> +<li><a class="reference" href="#documents" id="id26" name="id26">Documents</a><ul> +<li><a class="reference" href="#switching-between-documents" id="id27" name="id27">Switching between documents</a></li> </ul> </li> -<li><a class="reference" href="#character-sets-and-unicode-byte-order-mark-bom" id="id24" name="id24">Character sets and Unicode Byte-Order-Mark (BOM)</a><ul> -<li><a class="reference" href="#using-character-sets" id="id25" name="id25">Using character sets</a></li> -<li><a class="reference" href="#in-file-encoding-specification" id="id26" name="id26">In-file encoding specification</a></li> -<li><a class="reference" href="#special-encoding-none" id="id27" name="id27">Special encoding "None"</a></li> -<li><a class="reference" href="#unicode-byte-order-mark-bom" id="id28" name="id28">Unicode Byte-Order-Mark (BOM)</a></li> +<li><a class="reference" href="#character-sets-and-unicode-byte-order-mark-bom" id="id28" name="id28">Character sets and Unicode Byte-Order-Mark (BOM)</a><ul> +<li><a class="reference" href="#using-character-sets" id="id29" name="id29">Using character sets</a></li> +<li><a class="reference" href="#in-file-encoding-specification" id="id30" name="id30">In-file encoding specification</a></li> +<li><a class="reference" href="#special-encoding-none" id="id31" name="id31">Special encoding "None"</a></li> +<li><a class="reference" href="#unicode-byte-order-mark-bom" id="id32" name="id32">Unicode Byte-Order-Mark (BOM)</a></li> </ul> </li> -<li><a class="reference" href="#editing" id="id29" name="id29">Editing</a><ul> -<li><a class="reference" href="#folding" id="id30" name="id30">Folding</a></li> -<li><a class="reference" href="#column-mode-editing" id="id31" name="id31">Column mode editing</a></li> -<li><a class="reference" href="#drag-and-drop-of-text" id="id32" name="id32">Drag and drop of text</a></li> -<li><a class="reference" href="#indentation" id="id33" name="id33">Indentation</a></li> -<li><a class="reference" href="#auto-indentation" id="id34" name="id34">Auto-indentation</a></li> -<li><a class="reference" href="#bookmarks" id="id35" name="id35">Bookmarks</a></li> -<li><a class="reference" href="#code-navigation-history" id="id36" name="id36">Code Navigation History</a></li> -<li><a class="reference" href="#send-text-through-definable-commands" id="id37" name="id37">Send text through definable commands</a></li> -<li><a class="reference" href="#context-actions" id="id38" name="id38">Context actions</a></li> -<li><a class="reference" href="#user-definable-snippets" id="id39" name="id39">User-definable snippets</a></li> -<li><a class="reference" href="#inserting-unicode-characters" id="id40" name="id40">Inserting unicode characters</a></li> +<li><a class="reference" href="#editing" id="id33" name="id33">Editing</a><ul> +<li><a class="reference" href="#folding" id="id34" name="id34">Folding</a></li> +<li><a class="reference" href="#column-mode-editing" id="id35" name="id35">Column mode editing</a></li> +<li><a class="reference" href="#drag-and-drop-of-text" id="id36" name="id36">Drag and drop of text</a></li> +<li><a class="reference" href="#indentation" id="id37" name="id37">Indentation</a></li> +<li><a class="reference" href="#auto-indentation" id="id38" name="id38">Auto-indentation</a></li> +<li><a class="reference" href="#bookmarks" id="id39" name="id39">Bookmarks</a></li> +<li><a class="reference" href="#code-navigation-history" id="id40" name="id40">Code Navigation History</a></li> +<li><a class="reference" href="#send-text-through-definable-commands" id="id41" name="id41">Send text through definable commands</a></li> +<li><a class="reference" href="#context-actions" id="id42" name="id42">Context actions</a></li> +<li><a class="reference" href="#user-definable-snippets" id="id43" name="id43">User-definable snippets</a></li> +<li><a class="reference" href="#inserting-unicode-characters" id="id44" name="id44">Inserting unicode characters</a></li> </ul> </li> -<li><a class="reference" href="#search-replace-and-go-to" id="id41" name="id41">Search, replace and go to</a><ul> -<li><a class="reference" href="#find" id="id42" name="id42">Find</a><ul> -<li><a class="reference" href="#matching-options" id="id43" name="id43">Matching options</a></li> -<li><a class="reference" href="#find-all" id="id44" name="id44">Find all</a></li> -<li><a class="reference" href="#change-font-in-search-dialog-text-fields" id="id45" name="id45">Change font in search dialog text fields</a></li> +<li><a class="reference" href="#search-replace-and-go-to" id="id45" name="id45">Search, replace and go to</a><ul> +<li><a class="reference" href="#find" id="id46" name="id46">Find</a><ul> +<li><a class="reference" href="#matching-options" id="id47" name="id47">Matching options</a></li> +<li><a class="reference" href="#find-all" id="id48" name="id48">Find all</a></li> +<li><a class="reference" href="#change-font-in-search-dialog-text-fields" id="id49" name="id49">Change font in search dialog text fields</a></li> </ul> </li> -<li><a class="reference" href="#find-usage" id="id46" name="id46">Find usage</a></li> -<li><a class="reference" href="#find-in-files" id="id47" name="id47">Find in files</a><ul> -<li><a class="reference" href="#filtering-out-version-control-files" id="id48" name="id48">Filtering out version control files</a></li> +<li><a class="reference" href="#find-usage" id="id50" name="id50">Find usage</a></li> +<li><a class="reference" href="#find-in-files" id="id51" name="id51">Find in files</a><ul> +<li><a class="reference" href="#filtering-out-version-control-files" id="id52" name="id52">Filtering out version control files</a></li> </ul> </li> -<li><a class="reference" href="#replace" id="id49" name="id49">Replace</a><ul> -<li><a class="reference" href="#replace-all" id="id50" name="id50">Replace all</a></li> +<li><a class="reference" href="#replace" id="id53" name="id53">Replace</a><ul> +<li><a class="reference" href="#replace-all" id="id54" name="id54">Replace all</a></li> </ul> </li> -<li><a class="reference" href="#go-to-tag-definition" id="id51" name="id51">Go to tag definition</a></li> -<li><a class="reference" href="#go-to-tag-declaration" id="id52" name="id52">Go to tag declaration</a></li> -<li><a class="reference" href="#go-to-line" id="id53" name="id53">Go to line</a></li> -<li><a class="reference" href="#regular-expressions" id="id54" name="id54">Regular expressions</a><ul> -<li><a class="reference" href="#partial-posix-compatibility" id="id55" name="id55">Partial POSIX compatibility</a></li> +<li><a class="reference" href="#go-to-tag-definition" id="id55" name="id55">Go to tag definition</a></li> +<li><a class="reference" href="#go-to-tag-declaration" id="id56" name="id56">Go to tag declaration</a></li> +<li><a class="reference" href="#go-to-line" id="id57" name="id57">Go to line</a></li> +<li><a class="reference" href="#regular-expressions" id="id58" name="id58">Regular expressions</a><ul> +<li><a class="reference" href="#partial-posix-compatibility" id="id59" name="id59">Partial POSIX compatibility</a></li> </ul> </li> </ul> </li> -<li><a class="reference" href="#tags" id="id56" name="id56">Tags</a><ul> -<li><a class="reference" href="#workspace-tags" id="id57" name="id57">Workspace tags</a></li> -<li><a class="reference" href="#global-tags" id="id58" name="id58">Global tags</a><ul> -<li><a class="reference" href="#default-global-tags-files" id="id59" name="id59">Default global tags files</a></li> -<li><a class="reference" href="#generating-a-global-tags-file" id="id60" name="id60">Generating a global tags file</a></li> +<li><a class="reference" href="#tags" id="id60" name="id60">Tags</a><ul> +<li><a class="reference" href="#workspace-tags" id="id61" name="id61">Workspace tags</a></li> +<li><a class="reference" href="#global-tags" id="id62" name="id62">Global tags</a><ul> +<li><a class="reference" href="#default-global-tags-files" id="id63" name="id63">Default global tags files</a></li> +<li><a class="reference" href="#generating-a-global-tags-file" id="id64" name="id64">Generating a global tags file</a></li> </ul> </li> -<li><a class="reference" href="#ignore-tags" id="id61" name="id61">Ignore tags</a></li> +<li><a class="reference" href="#ignore-tags" id="id65" name="id65">Ignore tags</a></li> </ul> </li> -<li><a class="reference" href="#preferences" id="id62" name="id62">Preferences</a><ul> -<li><a class="reference" href="#general-tab-in-preferences-dialog" id="id63" name="id63">General tab in preferences dialog</a><ul> -<li><a class="reference" href="#id1" id="id64" name="id64">Startup</a></li> -<li><a class="reference" href="#shutdown" id="id65" name="id65">Shutdown</a></li> -<li><a class="reference" href="#projects" id="id66" name="id66">Projects</a></li> -<li><a class="reference" href="#miscellaneous" id="id67" name="id67">Miscellaneous</a></li> +<li><a class="reference" href="#preferences" id="id66" name="id66">Preferences</a><ul> +<li><a class="reference" href="#general-tab-in-preferences-dialog" id="id67" name="id67">General tab in preferences dialog</a><ul> +<li><a class="reference" href="#id1" id="id68" name="id68">Startup</a></li> +<li><a class="reference" href="#shutdown" id="id69" name="id69">Shutdown</a></li> +<li><a class="reference" href="#projects" id="id70" name="id70">Projects</a></li> +<li><a class="reference" href="#miscellaneous" id="id71" name="id71">Miscellaneous</a></li> </ul> </li> -<li><a class="reference" href="#interface-tab-in-preferences-dialog" id="id68" name="id68">Interface tab in preferences dialog</a><ul> -<li><a class="reference" href="#sidebar" id="id69" name="id69">Sidebar</a></li> -<li><a class="reference" href="#fonts" id="id70" name="id70">Fonts</a></li> -<li><a class="reference" href="#editor-tabs" id="id71" name="id71">Editor tabs</a></li> -<li><a class="reference" href="#tab-positions" id="id72" name="id72">Tab positions</a></li> -<li><a class="reference" href="#id2" id="id73" name="id73">Miscellaneous</a></li> +<li><a class="reference" href="#interface-tab-in-preferences-dialog" id="id72" name="id72">Interface tab in preferences dialog</a><ul> +<li><a class="reference" href="#sidebar" id="id73" name="id73">Sidebar</a></li> +<li><a class="reference" href="#fonts" id="id74" name="id74">Fonts</a></li> +<li><a class="reference" href="#editor-tabs" id="id75" name="id75">Editor tabs</a></li> +<li><a class="reference" href="#tab-positions" id="id76" name="id76">Tab positions</a></li> +<li><a class="reference" href="#id2" id="id77" name="id77">Miscellaneous</a></li> </ul> </li> -<li><a class="reference" href="#toolbar-tab-in-preferences-dialog" id="id74" name="id74">Toolbar tab in preferences dialog</a><ul> -<li><a class="reference" href="#toolbar" id="id75" name="id75">Toolbar</a></li> -<li><a class="reference" href="#items" id="id76" name="id76">Items</a></li> -<li><a class="reference" href="#appearance" id="id77" name="id77">Appearance</a></li> +<li><a class="reference" href="#toolbar-tab-in-preferences-dialog" id="id78" name="id78">Toolbar tab in preferences dialog</a><ul> +<li><a class="reference" href="#toolbar" id="id79" name="id79">Toolbar</a></li> +<li><a class="reference" href="#items" id="id80" name="id80">Items</a></li> +<li><a class="reference" href="#appearance" id="id81" name="id81">Appearance</a></li> </ul> </li> -<li><a class="reference" href="#editor-features-tab-in-preferences-dialog" id="id78" name="id78">Editor Features tab in preferences dialog</a><ul> -<li><a class="reference" href="#indentation-group" id="id79" name="id79">Indentation group</a></li> -<li><a class="reference" href="#features" id="id80" name="id80">Features</a></li> +<li><a class="reference" href="#editor-features-tab-in-preferences-dialog" id="id82" name="id82">Editor Features tab in preferences dialog</a><ul> +<li><a class="reference" href="#indentation-group" id="id83" name="id83">Indentation group</a></li> +<li><a class="reference" href="#features" id="id84" name="id84">Features</a></li> </ul> </li> -<li><a class="reference" href="#editor-completions-tab-in-preferences-dialog" id="id81" name="id81">Editor Completions tab in preferences dialog</a></li> -<li><a class="reference" href="#editor-display-tab-in-preferences-dialog" id="id82" name="id82">Editor Display tab in preferences dialog</a><ul> -<li><a class="reference" href="#display" id="id83" name="id83">Display</a></li> -<li><a class="reference" href="#long-line-marker" id="id84" name="id84">Long line marker</a></li> +<li><a class="reference" href="#editor-completions-tab-in-preferences-dialog" id="id85" name="id85">Editor Completions tab in preferences dialog</a></li> +<li><a class="reference" href="#editor-display-tab-in-preferences-dialog" id="id86" name="id86">Editor Display tab in preferences dialog</a><ul> +<li><a class="reference" href="#display" id="id87" name="id87">Display</a></li> +<li><a class="reference" href="#long-line-marker" id="id88" name="id88">Long line marker</a></li> </ul> </li> -<li><a class="reference" href="#files-tab-in-preferences-dialog" id="id85" name="id85">Files tab in preferences dialog</a><ul> -<li><a class="reference" href="#new-files" id="id86" name="id86">New files</a></li> -<li><a class="reference" href="#saving-files" id="id87" name="id87">Saving files</a></li> -<li><a class="reference" href="#id3" id="id88" name="id88">Miscellaneous</a></li> +<li><a class="reference" href="#files-tab-in-preferences-dialog" id="id89" name="id89">Files tab in preferences dialog</a><ul> +<li><a class="reference" href="#new-files" id="id90" name="id90">New files</a></li> +<li><a class="reference" href="#saving-files" id="id91" name="id91">Saving files</a></li> +<li><a class="reference" href="#id3" id="id92" name="id92">Miscellaneous</a></li> </ul> </li> -<li><a class="reference" href="#tools-tab-in-preferences-dialog" id="id89" name="id89">Tools tab in preferences dialog</a><ul> -<li><a class="reference" href="#tool-paths" id="id90" name="id90">Tool paths</a></li> -<li><a class="reference" href="#commands" id="id91" name="id91">Commands</a></li> +<li><a class="reference" href="#tools-tab-in-preferences-dialog" id="id93" name="id93">Tools tab in preferences dialog</a><ul> +<li><a class="reference" href="#tool-paths" id="id94" name="id94">Tool paths</a></li> +<li><a class="reference" href="#commands" id="id95" name="id95">Commands</a></li> </ul> </li> -<li><a class="reference" href="#template-tab-in-preferences-dialog" id="id92" name="id92">Template tab in preferences dialog</a><ul> -<li><a class="reference" href="#template-data" id="id93" name="id93">Template data</a></li> +<li><a class="reference" href="#template-tab-in-preferences-dialog" id="id96" name="id96">Template tab in preferences dialog</a><ul> +<li><a class="reference" href="#template-data" id="id97" name="id97">Template data</a></li> </ul> </li> -<li><a class="reference" href="#keybinding-tab-in-preferences-dialog" id="id94" name="id94">Keybinding tab in preferences dialog</a></li> -<li><a class="reference" href="#printing-tab-in-preferences-dialog" id="id95" name="id95">Printing tab in preferences dialog</a></li> -<li><a class="reference" href="#vte-tab-in-preferences-dialog" id="id96" name="id96">VTE tab in preferences dialog</a><ul> -<li><a class="reference" href="#terminal-widget" id="id97" name="id97">Terminal widget</a></li> +<li><a class="reference" href="#keybinding-tab-in-preferences-dialog" id="id98" name="id98">Keybinding tab in preferences dialog</a></li> +<li><a class="reference" href="#printing-tab-in-preferences-dialog" id="id99" name="id99">Printing tab in preferences dialog</a></li> +<li><a class="reference" href="#vte-tab-in-preferences-dialog" id="id100" name="id100">VTE tab in preferences dialog</a><ul> +<li><a class="reference" href="#terminal-widget" id="id101" name="id101">Terminal widget</a></li> </ul> </li> </ul> </li> -<li><a class="reference" href="#project-management" id="id98" name="id98">Project Management</a><ul> -<li><a class="reference" href="#new-project" id="id99" name="id99">New Project</a></li> -<li><a class="reference" href="#project-properties" id="id100" name="id100">Project Properties</a><ul> -<li><a class="reference" href="#make-in-base-path" id="id101" name="id101">Make in base path</a></li> -<li><a class="reference" href="#run-command" id="id102" name="id102">Run command</a></li> +<li><a class="reference" href="#project-management" id="id102" name="id102">Project Management</a><ul> +<li><a class="reference" href="#new-project" id="id103" name="id103">New Project</a></li> +<li><a class="reference" href="#project-properties" id="id104" name="id104">Project Properties</a><ul> +<li><a class="reference" href="#make-in-base-path" id="id105" name="id105">Make in base path</a></li> +<li><a class="reference" href="#run-command" id="id106" name="id106">Run command</a></li> </ul> </li> -<li><a class="reference" href="#open-project" id="id103" name="id103">Open Project</a></li> -<li><a class="reference" href="#close-project" id="id104" name="id104">Close Project</a></li> +<li><a class="reference" href="#open-project" id="id107" name="id107">Open Project</a></li> +<li><a class="reference" href="#close-project" id="id108" name="id108">Close Project</a></li> </ul> </li> -<li><a class="reference" href="#build-system" id="id105" name="id105">Build system</a><ul> -<li><a class="reference" href="#compile" id="id106" name="id106">Compile</a></li> -<li><a class="reference" href="#build" id="id107" name="id107">Build</a></li> -<li><a class="reference" href="#make-all" id="id108" name="id108">Make all</a></li> -<li><a class="reference" href="#make-custom-target" id="id109" name="id109">Make custom target</a></li> -<li><a class="reference" href="#make-object" id="id110" name="id110">Make object</a></li> -<li><a class="reference" href="#execute" id="id111" name="id111">Execute</a></li> -<li><a class="reference" href="#stopping-running-processes" id="id112" name="id112">Stopping running processes</a><ul> -<li><a class="reference" href="#terminal-emulators" id="id113" name="id113">Terminal emulators</a></li> +<li><a class="reference" href="#build-system" id="id109" name="id109">Build system</a><ul> +<li><a class="reference" href="#compile" id="id110" name="id110">Compile</a></li> +<li><a class="reference" href="#build" id="id111" name="id111">Build</a></li> +<li><a class="reference" href="#make-all" id="id112" name="id112">Make all</a></li> +<li><a class="reference" href="#make-custom-target" id="id113" name="id113">Make custom target</a></li> +<li><a class="reference" href="#make-object" id="id114" name="id114">Make object</a></li> +<li><a class="reference" href="#execute" id="id115" name="id115">Execute</a></li> +<li><a class="reference" href="#stopping-running-processes" id="id116" name="id116">Stopping running processes</a><ul> +<li><a class="reference" href="#terminal-emulators" id="id117" name="id117">Terminal emulators</a></li> </ul> </li> -<li><a class="reference" href="#set-includes-and-arguments" id="id114" name="id114">Set Includes and Arguments</a><ul> -<li><a class="reference" href="#one-step-compilation" id="id115" name="id115">One step compilation</a></li> +<li><a class="reference" href="#set-includes-and-arguments" id="id118" name="id118">Set Includes and Arguments</a><ul> +<li><a class="reference" href="#one-step-compilation" id="id119" name="id119">One step compilation</a></li> </ul> </li> -<li><a class="reference" href="#indicators" id="id116" name="id116">Indicators</a></li> +<li><a class="reference" href="#indicators" id="id120" name="id120">Indicators</a></li> </ul> </li> -<li><a class="reference" href="#printing-support" id="id117" name="id117">Printing support</a></li> -<li><a class="reference" href="#plugins" id="id118" name="id118">Plugins</a></li> -<li><a class="reference" href="#keybindings" id="id119" name="id119">Keybindings</a><ul> -<li><a class="reference" href="#switching-documents" id="id120" name="id120">Switching documents</a></li> -<li><a class="reference" href="#configurable-keybindings" id="id121" name="id121">Configurable keybindings</a></li> +<li><a class="reference" href="#printing-support" id="id121" name="id121">Printing support</a></li> +<li><a class="reference" href="#plugins" id="id122" name="id122">Plugins</a></li> +<li><a class="reference" href="#keybindings" id="id123" name="id123">Keybindings</a><ul> +<li><a class="reference" href="#switching-documents" id="id124" name="id124">Switching documents</a></li> +<li><a class="reference" href="#configurable-keybindings" id="id125" name="id125">Configurable keybindings</a></li> </ul> </li> </ul> </li> -<li><a class="reference" href="#configuration-files" id="id122" name="id122">Configuration files</a><ul> -<li><a class="reference" href="#global-configuration-file" id="id123" name="id123">Global configuration file</a></li> -<li><a class="reference" href="#filetype-definition-files" id="id124" name="id124">Filetype definition files</a><ul> -<li><a class="reference" href="#format" id="id125" name="id125">Format</a><ul> -<li><a class="reference" href="#styling-section" id="id126" name="id126">[styling] Section</a></li> -<li><a class="reference" href="#keywords-section" id="id127" name="id127">[keywords] Section</a></li> -<li><a class="reference" href="#settings-section" id="id128" name="id128">[settings] Section</a></li> -<li><a class="reference" href="#build-settings-section" id="id129" name="id129">[build_settings] Section</a></li> +<li><a class="reference" href="#configuration-files" id="id126" name="id126">Configuration files</a><ul> +<li><a class="reference" href="#global-configuration-file" id="id127" name="id127">Global configuration file</a></li> +<li><a class="reference" href="#filetype-definition-files" id="id128" name="id128">Filetype definition files</a><ul> +<li><a class="reference" href="#format" id="id129" name="id129">Format</a><ul> +<li><a class="reference" href="#styling-section" id="id130" name="id130">[styling] Section</a></li> +<li><a class="reference" href="#keywords-section" id="id131" name="id131">[keywords] Section</a></li> +<li><a class="reference" href="#settings-section" id="id132" name="id132">[settings] Section</a></li> +<li><a class="reference" href="#build-settings-section" id="id133" name="id133">[build_settings] Section</a></li> </ul> </li> -<li><a class="reference" href="#special-file-filetypes-common" id="id130" name="id130">Special file filetypes.common</a></li> +<li><a class="reference" href="#special-file-filetypes-common" id="id134" name="id134">Special file filetypes.common</a></li> </ul> </li> -<li><a class="reference" href="#filetype-extensions" id="id131" name="id131">Filetype extensions</a></li> -<li><a class="reference" href="#templates" id="id132" name="id132">Templates</a><ul> -<li><a class="reference" href="#template-metadata" id="id133" name="id133">Template metadata</a></li> -<li><a class="reference" href="#file-templates" id="id134" name="id134">File templates</a><ul> -<li><a class="reference" href="#custom-file-templates" id="id135" name="id135">Custom file templates</a></li> -<li><a class="reference" href="#filetype-templates" id="id136" name="id136">Filetype templates</a></li> +<li><a class="reference" href="#filetype-extensions" id="id135" name="id135">Filetype extensions</a></li> +<li><a class="reference" href="#templates" id="id136" name="id136">Templates</a><ul> +<li><a class="reference" href="#template-metadata" id="id137" name="id137">Template metadata</a></li> +<li><a class="reference" href="#file-templates" id="id138" name="id138">File templates</a><ul> +<li><a class="reference" href="#custom-file-templates" id="id139" name="id139">Custom file templates</a></li> +<li><a class="reference" href="#filetype-templates" id="id140" name="id140">Filetype templates</a></li> </ul> </li> -<li><a class="reference" href="#customizing-templates" id="id137" name="id137">Customizing templates</a><ul> -<li><a class="reference" href="#template-wildcards" id="id138" name="id138">Template wildcards</a></li> +<li><a class="reference" href="#customizing-templates" id="id141" name="id141">Customizing templates</a><ul> +<li><a class="reference" href="#template-wildcards" id="id142" name="id142">Template wildcards</a></li> </ul> </li> </ul> </li> </ul> </li> -<li><a class="reference" href="#contributing-to-this-document" id="id139" name="id139">Contributing to this document</a></li> -<li><a class="reference" href="#scintilla-keyboard-commands" id="id140" name="id140">Scintilla keyboard commands</a><ul> -<li><a class="reference" href="#keyboard-commands" id="id141" name="id141">Keyboard commands</a></li> +<li><a class="reference" href="#contributing-to-this-document" id="id143" name="id143">Contributing to this document</a></li> +<li><a class="reference" href="#scintilla-keyboard-commands" id="id144" name="id144">Scintilla keyboard commands</a><ul> +<li><a class="reference" href="#keyboard-commands" id="id145" name="id145">Keyboard commands</a></li> </ul> </li> -<li><a class="reference" href="#hidden-preferences" id="id142" name="id142">Hidden preferences</a></li> -<li><a class="reference" href="#compile-time-options" id="id143" name="id143">Compile-time options</a><ul> -<li><a class="reference" href="#src-geany-h" id="id144" name="id144">src/geany.h</a></li> -<li><a class="reference" href="#project-h" id="id145" name="id145">project.h</a></li> -<li><a class="reference" href="#editor-h" id="id146" name="id146">editor.h</a></li> -<li><a class="reference" href="#keyfile-c" id="id147" name="id147">keyfile.c</a></li> +<li><a class="reference" href="#hidden-preferences" id="id146" name="id146">Hidden preferences</a></li> +<li><a class="reference" href="#compile-time-options" id="id147" name="id147">Compile-time options</a><ul> +<li><a class="reference" href="#src-geany-h" id="id148" name="id148">src/geany.h</a></li> +<li><a class="reference" href="#project-h" id="id149" name="id149">project.h</a></li> +<li><a class="reference" href="#editor-h" id="id150" name="id150">editor.h</a></li> +<li><a class="reference" href="#keyfile-c" id="id151" name="id151">keyfile.c</a></li> </ul> </li> -<li><a class="reference" href="#gnu-general-public-license" id="id148" name="id148">GNU General Public License</a></li> -<li><a class="reference" href="#license-for-scintilla-and-scite" id="id149" name="id149">License for Scintilla and SciTE</a></li> +<li><a class="reference" href="#gnu-general-public-license" id="id152" name="id152">GNU General Public License</a></li> +<li><a class="reference" href="#license-for-scintilla-and-scite" id="id153" name="id153">License for Scintilla and SciTE</a></li> </ul> </div> <div class="section"> -<h1><a class="toc-backref" href="#id5" id="introduction" name="introduction">Introduction</a></h1> +<h1><a class="toc-backref" href="#id9" id="introduction" name="introduction">Introduction</a></h1> <div class="section"> -<h2><a class="toc-backref" href="#id6" id="about-geany" name="about-geany">About Geany</a></h2> +<h2><a class="toc-backref" href="#id10" id="about-geany" name="about-geany">About Geany</a></h2> <p>Geany is a small and lightweight Integrated Development Environment. It was developed to provide a small and fast IDE, which has only a few dependencies from other packages. Another goal was to be as independent @@ -399,12 +399,12 @@ </ul> </div> <div class="section"> -<h2><a class="toc-backref" href="#id7" id="where-to-get-it" name="where-to-get-it">Where to get it</a></h2> +<h2><a class="toc-backref" href="#id11" id="where-to-get-it" name="where-to-get-it">Where to get it</a></h2> <p>You can obtain Geany from <a class="reference" href="http://geany.uvena.de">http://geany.uvena.de</a> or perhaps also from your distributor.</p> </div> <div class="section"> -<h2><a class="toc-backref" href="#id8" id="license" name="license">License</a></h2> +<h2><a class="toc-backref" href="#id12" id="license" name="license">License</a></h2> <p>Geany is distributed 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. A copy of this @@ -415,16 +415,16 @@ <a class="reference" href="#license-for-scintilla-and-scite">License for Scintilla and SciTE</a>.</p> </div> <div class="section"> -<h2><a class="toc-backref" href="#id9" id="about-this-document" name="about-this-document">About this document</a></h2> +<h2><a class="toc-backref" href="#id13" id="about-this-document" name="about-this-document">About this document</a></h2> <p>This documentation is available in various formats like HTML, text and PDF. The latest version is always available at <a class="reference" href="http://geany.uvena.de">http://geany.uvena.de</a>.</p> <p>If you want to contribute to it, see <a class="reference" href="#contributing-to-this-document">Contributing to this document</a>.</p> </div> </div> <div class="section"> -<h1><a class="toc-backref" href="#id10" id="installation" name="installation">Installation</a></h1> +<h1><a class="toc-backref" href="#id14" id="installation" name="installation">Installation</a></h1> <div class="section"> -<h2><a class="toc-backref" href="#id11" id="requirements" name="requirements">Requirements</a></h2> +<h2><a class="toc-backref" href="#id15" id="requirements" name="requirements">Requirements</a></h2> <p>For compiling Geany yourself, you will need the GTK (>= 2.6.0) libraries and header files. You will also need the Pango, Glib and ATK libraries and header files. All these files are available at @@ -434,7 +434,7 @@ GNU versions of these tools are recommended.</p> </div> <div class="section"> -<h2><a class="toc-backref" href="#id12" id="source-compilation" name="source-compilation">Source compilation</a></h2> +<h2><a class="toc-backref" href="#id16" id="source-compilation" name="source-compilation">Source compilation</a></h2> <p>Compiling Geany is quite easy. The following should do it:</p> <pre class="literal-block"> % ./configure @@ -461,15 +461,15 @@ at <enrico(dot)troeger(at)uvena(dot)de>.</p> </div> <div class="section"> -<h2><a class="toc-backref" href="#id13" id="binary-packages" name="binary-packages">Binary packages</a></h2> +<h2><a class="toc-backref" href="#id17" id="binary-packages" name="binary-packages">Binary packages</a></h2> <p>There are many binary packages available. For an up to date but maybe incomplete list see <a class="reference" href="http://geany.uvena.de/Download/Releases">http://geany.uvena.de/Download/Releases</a>.</p> </div> </div> <div class="section"> -<h1><a class="toc-backref" href="#id14" id="usage" name="usage">Usage</a></h1> +<h1><a class="toc-backref" href="#id18" id="usage" name="usage">Usage</a></h1> <div class="section"> -<h2><a class="toc-backref" href="#id15" id="getting-started" name="getting-started">Getting started</a></h2> +<h2><a class="toc-backref" href="#id19" id="getting-started" name="getting-started">Getting started</a></h2> <p>You can start Geany in the following ways:</p> <ul> <li><p class="first">From the Desktop Environment menu:</p> @@ -486,7 +486,7 @@ </ul> </div> <div class="section"> -<h2><a class="toc-backref" href="#id16" id="command-line-options" name="command-line-options">Command line options</a></h2> +<h2><a class="toc-backref" href="#id20" id="command-line-options" name="command-line-options">Command line options</a></h2> <table border="1" class="docutils"> <colgroup> <col width="13%" /> @@ -615,9 +615,9 @@ help screen.</p> </div> <div class="section"> -<h2><a class="toc-backref" href="#id17" id="general" name="general">General</a></h2> +<h2><a class="toc-backref" href="#id21" id="general" name="general">General</a></h2> <div class="section"> -<h3><a class="toc-backref" href="#id18" id="startup" name="startup">Startup</a></h3> +<h3><a class="toc-backref" href="#id22" id="startup" name="startup">Startup</a></h3> <p>At startup, Geany loads all files from the last time Geany was launched. You can disable this feature in the preferences dialog (see <a class="reference" href="#general-tab-in-preferences-dialog">General tab in preferences dialog</a>). If you specify some @@ -632,7 +632,7 @@ files in a running instance using the appropriate command line option.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id19" id="opening-files-from-the-command-line-in-a-running-instance" name="opening-files-from-the-command-line-in-a-running-instance">Opening files from the command-line in a running instance</a></h3> +<h3><a class="toc-backref" href="#id23" id="opening-files-from-the-command-line-in-a-running-instance" name="opening-files-from-the-command-line-in-a-running-instance">Opening files from the command-line in a running instance</a></h3> <p>Geany detects an already running instance of itself and opens files from the command-line in the already running instance. So, Geany can be used to view and edit files by opening them from other programs @@ -641,7 +641,7 @@ line option -- see the section called <a class="reference" href="#command-line-options">Command line options</a>.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id20" id="virtual-terminal-emulator-widget-vte" name="virtual-terminal-emulator-widget-vte">Virtual terminal emulator widget (VTE)</a></h3> +<h3><a class="toc-backref" href="#id24" id="virtual-terminal-emulator-widget-vte" name="virtual-terminal-emulator-widget-vte">Virtual terminal emulator widget (VTE)</a></h3> <p>If you have installed <tt class="docutils literal"><span class="pre">libvte.so</span></tt> in your system, it is loaded automatically by Geany, and you will have a terminal widget in the notebook at the bottom.</p> @@ -685,7 +685,7 @@ ./configure.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id21" id="defining-own-widget-styles-using-gtkrc-2-0" name="defining-own-widget-styles-using-gtkrc-2-0">Defining own widget styles using .gtkrc-2.0</a></h3> +<h3><a class="toc-backref" href="#id25" id="defining-own-widget-styles-using-gtkrc-2-0" name="defining-own-widget-styles-using-gtkrc-2-0">Defining own widget styles using .gtkrc-2.0</a></h3> <p>You can define your widget style for many of Geany's GUI parts. To do this, just edit your <tt class="docutils literal"><span class="pre">.gtkrc-2.0</span></tt> (usually found in your home directory on UNIX-like systems and in the etc subdirectory of your @@ -724,9 +724,9 @@ </div> </div> <div class="section"> -<h2><a class="toc-backref" href="#id22" id="documents" name="documents">Documents</a></h2> +<h2><a class="toc-backref" href="#id26" id="documents" name="documents">Documents</a></h2> <div class="section"> -<h3><a class="toc-backref" href="#id23" id="switching-between-documents" name="switching-between-documents">Switching between documents</a></h3> +<h3><a class="toc-backref" href="#id27" id="switching-between-documents" name="switching-between-documents">Switching between documents</a></h3> <p>The documents list and the editor tabs are two different ways to switch between documents using the mouse. When you hit the key combination to move between tabs, the order is determined by the tab @@ -735,9 +735,9 @@ </div> </div> <div class="section"> -<h2><a class="toc-backref" href="#id24" id="character-sets-and-unicode-byte-order-mark-bom" name="character-sets-and-unicode-byte-order-mark-bom">Character sets and Unicode Byte-Order-Mark (BOM)</a></h2> +<h2><a class="toc-backref" href="#id28" id="character-sets-and-unicode-byte-order-mark-bom" name="character-sets-and-unicode-byte-order-mark-bom">Character sets and Unicode Byte-Order-Mark (BOM)</a></h2> <div class="section"> -<h3><a class="toc-backref" href="#id25" id="using-character-sets" name="using-character-sets">Using character sets</a></h3> +<h3><a class="toc-backref" href="#id29" id="using-character-sets" name="using-character-sets">Using character sets</a></h3> <p>Geany provides support for detecting and converting character sets. So you can open and save files in different character sets and even can convert a file from a character set to another one. To do this, @@ -783,7 +783,7 @@ </ul> </div> <div class="section"> -<h3><a class="toc-backref" href="#id26" id="in-file-encoding-specification" name="in-file-encoding-specification">In-file encoding specification</a></h3> +<h3><a class="toc-backref" href="#id30" id="in-file-encoding-specification" name="in-file-encoding-specification">In-file encoding specification</a></h3> <p>Geany detects meta tags of HTML files which contain charset information like:</p> <pre class="literal-block"> @@ -825,7 +825,7 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id27" id="special-encoding-none" name="special-encoding-none">Special encoding "None"</a></h3> +<h3><a class="toc-backref" href="#id31" id="special-encoding-none" name="special-encoding-none">Special encoding "None"</a></h3> <p>There is a special encoding "None" which is actually no real encoding. It is useful when you know that Geany cannot auto detect the encoding of a file and it is not displayed correctly. Especially @@ -835,7 +835,7 @@ without any character conversion.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id28" id="unicode-byte-order-mark-bom" name="unicode-byte-order-mark-bom">Unicode Byte-Order-Mark (BOM)</a></h3> +<h3><a class="toc-backref" href="#id32" id="unicode-byte-order-mark-bom" name="unicode-byte-order-mark-bom">Unicode Byte-Order-Mark (BOM)</a></h3> <p>Furthermore, Geany detects an Unicode Byte Order Mark (see <a class="reference" href="http://en.wikipedia.org/wiki/Byte_Order_Mark">http://en.wikipedia.org/wiki/Byte_Order_Mark</a> for details). Of course, this feature is only available if the opened file is in an unicode @@ -856,9 +856,9 @@ </div> </div> <div class="section"> -<h2><a class="toc-backref" href="#id29" id="editing" name="editing">Editing</a></h2> +<h2><a class="toc-backref" href="#id33" id="editing" name="editing">Editing</a></h2> <div class="section"> -<h3><a class="toc-backref" href="#id30" id="folding" name="folding">Folding</a></h3> +<h3><a class="toc-backref" href="#id34" id="folding" name="folding">Folding</a></h3> <p>Geany provides basic code folding support. Folding means the ability to show and hide parts of the text in the current file. You can hide unimportant code sections and concentrate on the parts you are working on @@ -882,7 +882,7 @@ it for this click and vice versa.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id31" id="column-mode-editing" name="column-mode-editing">Column mode editing</a></h3> +<h3><a class="toc-backref" href="#id35" id="column-mode-editing" name="column-mode-editing">Column mode editing</a></h3> <p>There is basic support for column mode editing. To use it, create a rectangular selection by holding down the Control key while selecting some text. It is also possible to create a zero-column selection but @@ -892,7 +892,7 @@ selection.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id32" id="drag-and-drop-of-text" name="drag-and-drop-of-text">Drag and drop of text</a></h3> +<h3><a class="toc-backref" href="#id36" id="drag-and-drop-of-text" name="drag-and-drop-of-text">Drag and drop of text</a></h3> <p>If you drag selected text in the editor widget of Geany the text is moved to the position where the mouse pointer is when releasing the mouse button. Holding Control when releasing the mouse button will @@ -900,7 +900,7 @@ before the selected text was copied to the new position.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id33" id="indentation" name="indentation">Indentation</a></h3> +<h3><a class="toc-backref" href="#id37" id="indentation" name="indentation">Indentation</a></h3> <p>Geany allows each document to indent either with a tab character or multiple spaces. The default indent mode is set in the <a class="reference" href="#editor-features-tab-in-preferences-dialog">Editor Features tab in preferences dialog</a>. But this can be overridden using either @@ -918,7 +918,7 @@ </dl> </div> <div class="section"> -<h3><a class="toc-backref" href="#id34" id="auto-indentation" name="auto-indentation">Auto-indentation</a></h3> +<h3><a class="toc-backref" href="#id38" id="auto-indentation" name="auto-indentation">Auto-indentation</a></h3> <p>When enabled, auto-indentation happens when pressing <em>Enter</em> in the Editor. It adds a certain amount of indentation to the new line so the user doesn't always have to indent each line manually.</p> @@ -939,7 +939,7 @@ </dl> </div> <div class="section"> -<h3><a class="toc-backref" href="#id35" id="bookmarks" name="bookmarks">Bookmarks</a></h3> +<h3><a class="toc-backref" href="#id39" id="bookmarks" name="bookmarks">Bookmarks</a></h3> <p>Geany provides a handy bookmarking feature that lets you mark one or more lines in a document, and return the cursor to them using a key combination.</p> @@ -957,7 +957,7 @@ navigate around multiple files.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id36" id="code-navigation-history" name="code-navigation-history">Code Navigation History</a></h3> +<h3><a class="toc-backref" href="#id40" id="code-navigation-history" name="code-navigation-history">Code Navigation History</a></h3> <p>To ease navigation in source files and especially between different files, Geany lets you jump between different navigation points. Currently, this works for the following:</p> @@ -976,7 +976,7 @@ and between different files.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id37" id="send-text-through-definable-commands" name="send-text-through-definable-commands">Send text through definable commands</a></h3> +<h3><a class="toc-backref" href="#id41" id="send-text-through-definable-commands" name="send-text-through-definable-commands">Send text through definable commands</a></h3> <p>You can define several custom commands in Geany and send the current selection to one of these commands. The output of the command will be used to replace the current selection. So, it is possible to use text @@ -993,7 +993,7 @@ entry and press OK. It will be deleted automatically.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id38" id="context-actions" name="context-actions">Context actions</a></h3> +<h3><a class="toc-backref" href="#id42" id="context-actions" name="context-actions">Context actions</a></h3> <p>You can execute a specified command on the current word near the cursor position or an available selection and this word is passed as an argument to this command. It can be used for example to open @@ -1019,7 +1019,7 @@ called firefox) and it will open the address: <a class="reference" href="http://www.php.net/echo">http://www.php.net/echo</a>.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id39" id="user-definable-snippets" name="user-definable-snippets">User-definable snippets</a></h3> +<h3><a class="toc-backref" href="#id43" id="user-definable-snippets" name="user-definable-snippets">User-definable snippets</a></h3> <p>Snippets are small strings or code constructs which can be replaced or completed to a more complex string. So you can save a lot of time by not typing often used strings and letting Geany do the work for you. @@ -1115,7 +1115,7 @@ needs.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id40" id="inserting-unicode-characters" name="inserting-unicode-characters">Inserting unicode characters</a></h3> +<h3><a class="toc-backref" href="#id44" id="inserting-unicode-characters" name="inserting-unicode-characters">Inserting unicode characters</a></h3> <p>With GTK 2.10 and above, you can hit Ctrl-Shift-u, then still holding Ctrl-Shift, type some hex digits representing the code point for the character you want, then let go of Ctrl-Shift and hit a key such as @@ -1131,7 +1131,7 @@ </div> </div> <div class="section"> -<h2><a class="toc-backref" href="#id41" id="search-replace-and-go-to" name="search-replace-and-go-to">Search, replace and go to</a></h2> +<h2><a class="toc-backref" href="#id45" id="search-replace-and-go-to" name="search-replace-and-go-to">Search, replace and go to</a></h2> <p>This section describes search-related commands from the Search menu and the editor window's popup menu:</p> <ul class="simple"> @@ -1146,11 +1146,11 @@ <p>* These items are available from the editor window's popup menu, or by using a keyboard shortcut (see the section called <a class="reference" href="#keybindings">Keybindings</a>).</p> <div class="section"> -<h3><a class="toc-backref" href="#id42" id="find" name="find">Find</a></h3> +<h3><a class="toc-backref" href="#id46" id="find" name="find">Find</a></h3> <p>The Find dialog is used for finding text in one or more open documents.</p> <img alt="./images/find_dialog.png" src="./images/find_dialog.png" /> <div class="section"> -<h4><a class="toc-backref" href="#id43" id="matching-options" name="matching-options">Matching options</a></h4> +<h4><a class="toc-backref" href="#id47" id="matching-options" name="matching-options">Matching options</a></h4> <p>The syntax for the Use regular expressions option is shown in <a class="reference" href="#regular-expressions">Regular expressions</a>.</p> <p>The Use escape sequences option will transform any escaped characters @@ -1159,7 +1159,7 @@ (Unicode chararacters).</p> </div> <div class="section"> -<h4><a class="toc-backref" href="#id44" id="find-all" name="find-all">Find all</a></h4> +<h4><a class="toc-backref" href="#id48" id="find-all" name="find-all">Find all</a></h4> <p>To find all matches, click on the Find All expander. This will reveal several options:</p> <ul class="simple"> @@ -1176,7 +1176,7 @@ removed by selecting the Remove Markers command from the Document menu.</p> </div> <div class="section"> -<h4><a class="toc-backref" href="#id45" id="change-font-in-search-dialog-text-fields" name="change-font-in-search-dialog-text-fields">Change font in search dialog text fields</a></h4> +<h4><a class="toc-backref" href="#id49" id="change-font-in-search-dialog-text-fields" name="change-font-in-search-dialog-text-fields">Change font in search dialog text fields</a></h4> <p>All search related dialogs use a Monospace for the text input fields to increase the readibility of input text. This is useful when you are typing e.g. regular expressions with spaces, periods and commas which @@ -1198,7 +1198,7 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id46" id="find-usage" name="find-usage">Find usage</a></h3> +<h3><a class="toc-backref" href="#id50" id="find-usage" name="find-usage">Find usage</a></h3> <p>Find usage searches all open files. It is similar to the Find All In Session Find dialog command.</p> <p>If there is a selection, then it is used as the search text; otherwise @@ -1208,7 +1208,7 @@ shown in the Messages tab of the Message Window.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id47" id="find-in-files" name="find-in-files">Find in files</a></h3> +<h3><a class="toc-backref" href="#id51" id="find-in-files" name="find-in-files">Find in files</a></h3> <p>Find in files is a more powerful version of Find usage that searches all files in a certain directory using the Grep tool. The Grep tool must be correctly set in Preferences to the path of the system's Grep @@ -1217,7 +1217,7 @@ <p>The Extra options field is used to pass any additional arguments to the grep tool.</p> <div class="section"> -<h4><a class="toc-backref" href="#id48" id="filtering-out-version-control-files" name="filtering-out-version-control-files">Filtering out version control files</a></h4> +<h4><a class="toc-backref" href="#id52" id="filtering-out-version-control-files" name="filtering-out-version-control-files">Filtering out version control files</a></h4> <p>When using the <em>Recurse in subfolders</em> option with a directory that's under version control, you can set the <em>Extra options</em> field to use grep's <tt class="docutils literal"><span class="pre">--exclude</span></tt> flag to filter out filenames.</p> @@ -1229,7 +1229,7 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id49" id="replace" name="replace">Replace</a></h3> +<h3><a class="toc-backref" href="#id53" id="replace" name="replace">Replace</a></h3> <p>The Replace dialog is used for replacing text in one or more open documents.</p> <img alt="./images/replace_dialog.png" src="./images/replace_dialog.png" /> @@ -1239,7 +1239,7 @@ and to the replacement text; for the latter back references can be used -- see the entry for '\n' in <a class="reference" href="#regular-expressions">Regular expressions</a>.</p> <div class="section"> -<h4><a class="toc-backref" href="#id50" id="replace-all" name="replace-all">Replace all</a></h4> +<h4><a class="toc-backref" href="#id54" id="replace-all" name="replace-all">Replace all</a></h4> <p>To replace several matches, click on the <em>Replace All</em> expander. This will reveal several options:</p> <ul class="simple"> @@ -1254,7 +1254,7 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id51" id="go-to-tag-definition" name="go-to-tag-definition">Go to tag definition</a></h3> +<h3><a class="toc-backref" href="#id55" id="go-to-tag-definition" name="go-to-tag-definition">Go to tag definition</a></h3> <p>If the current word is the name of a tag definition (like a function body) and the file containing the tag definition is open, this command will switch to that file and go to the corresponding line number. The @@ -1263,17 +1263,17 @@ menu is used.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id52" id="go-to-tag-declaration" name="go-to-tag-declaration">Go to tag declaration</a></h3> +<h3><a class="toc-backref" href="#id56" id="go-to-tag-declaration" name="go-to-tag-declaration">Go to tag declaration</a></h3> <p>Like Go to tag definition, but for a forward declaration such as a function prototype or <tt class="docutils literal"><span class="pre">extern</span></tt> declaration instead of a function body.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id53" id="go-to-line" name="go-to-line">Go to line</a></h3> +<h3><a class="toc-backref" href="#id57" id="go-to-line" name="go-to-line">Go to line</a></h3> <p>Go to a particular line number in the current file.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id54" id="regular-expressions" name="regular-expressions">Regular expressions</a></h3> +<h3><a class="toc-backref" href="#id58" id="regular-expressions" name="regular-expressions">Regular expressions</a></h3> <p>You can use regular expressions in the Find and Replace dialogs by selecting the Use regular expressions check box. The syntax is POSIX-like, as described in the table below.</p> @@ -1346,14 +1346,14 @@ </tbody> </table> <div class="section"> -<h4><a class="toc-backref" href="#id55" id="partial-posix-compatibility" name="partial-posix-compatibility">Partial POSIX compatibility</a></h4> +<h4><a class="toc-backref" href="#id59" id="partial-posix-compatibility" name="partial-posix-compatibility">Partial POSIX compatibility</a></h4> <p>Note that the POSIX '?' regular expression character for optional matching is not supported by the Find and Replace dialogs.</p> </div> </div> </div> <div class="section"> -<h2><a class="toc-backref" href="#id56" id="tags" name="tags">Tags</a></h2> +<h2><a class="toc-backref" href="#id60" id="tags" name="tags">Tags</a></h2> <p>Geany has built-in functionality for generating tag information (aka "workspace tags") for supported filetypes when you open a file. You can also have Geany automatically load external tag files (aka "global @@ -1363,7 +1363,7 @@ (but is incompatible with ctags). You use Geany to generate global tags files, as described below.</p> <div class="section"> -<h3><a class="toc-backref" href="#id57" id="workspace-tags" name="workspace-tags">Workspace tags</a></h3> +<h3><a class="toc-backref" href="#id61" id="workspace-tags" name="workspace-tags">Workspace tags</a></h3> <p>Tags for each document are parsed whenever a file is loaded or saved. These are shown in the Symbol list in the Sidebar. These tags are also used for autocompletion of symbols and calltips for all documents @@ -1372,7 +1372,7 @@ <a class="reference" href="#go-to-tag-definition">Go to tag definition</a>.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id58" id="global-tags" name="global-tags">Global tags</a></h3> +<h3><a class="toc-backref" href="#id62" id="global-tags" name="global-tags">Global tags</a></h3> <p>Global tags are used to provide autocompletion of symbols and calltips without having to open the corresponding source files. This is intended for library APIs, as the tags file only has to be updated when you upgrade @@ -1392,7 +1392,7 @@ with the tags. See the section called <a class="reference" href="#filetype-extensions">Filetype extensions</a> for more information.</p> <div class="section"> -<h4><a class="toc-backref" href="#id59" id="default-global-tags-files" name="default-global-tags-files">Default global tags files</a></h4> +<h4><a class="toc-backref" href="#id63" id="default-global-tags-files" name="default-global-tags-files">Default global tags files</a></h4> <p>For some languages, a list of global tags is loaded when the corresponding filetype is first used. Currently these are for:</p> <ul class="simple"> @@ -1404,7 +1404,7 @@ </ul> </div> <div class="section"> -<h4><a class="toc-backref" href="#id60" id="generating-a-global-tags-file" name="generating-a-global-tags-file">Generating a global tags file</a></h4> +<h4><a class="toc-backref" href="#id64" id="generating-a-global-tags-file" name="generating-a-global-tags-file">Generating a global tags file</a></h4> <p><em>Filetypes support:</em></p> <p>Currently this is not yet supported for Pascal, PHP and LaTeX filetypes.</p> @@ -1452,7 +1452,7 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id61" id="ignore-tags" name="ignore-tags">Ignore tags</a></h3> +<h3><a class="toc-backref" href="#id65" id="ignore-tags" name="ignore-tags">Ignore tags</a></h3> <p>You can also ignore certain tags if they would lead to wrong parsing of the code. Simply create a file called "ignore.tags" in your Geany configuration directory (usually <tt class="docutils literal"><span class="pre">~/.geany/</span></tt>). Then list all tags @@ -1476,7 +1476,7 @@ </div> </div> <div class="section"> -<h2><a class="toc-backref" href="#id62" id="preferences" name="preferences">Preferences</a></h2> +<h2><a class="toc-backref" href="#id66" id="preferences" name="preferences">Preferences</a></h2> <p>You may adjust Geany's settings using the Edit --> Preferences dialog. Any changes you make there can be applied by hitting either the Apply or the OK button. These settings will persist between Geany @@ -1494,10 +1494,10 @@ comes after the screenshot of that tab.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id63" id="general-tab-in-preferences-dialog" name="general-tab-in-preferences-dialog">General tab in preferences dialog</a></h3> +<h3><a class="toc-backref" href="#id67" id="general-tab-in-preferences-dialog" name="general-tab-in-preferences-dialog">General tab in preferences dialog</a></h3> <img alt="./images/pref_dialog_gen.png" src="./images/pref_dialog_gen.png" /> <div class="section"> -<h4><a class="toc-backref" href="#id64" id="id1" name="id1">Startup</a></h4> +<h4><a class="toc-backref" href="#id68" id="id1" name="id1">Startup</a></h4> <dl class="docutils"> <dt>Load files from the last session</dt> <dd>On startup, load the same files you had open the last time you @@ -1509,7 +1509,7 @@ </dl> </div> <div class="section"> -<h4><a class="toc-backref" href="#id65" id="shutdown" name="shutdown">Shutdown</a></h4> +<h4><a class="toc-backref" href="#id69" id="shutdown" name="shutdown">Shutdown</a></h4> <dl class="docutils"> <dt>Save window position and geometry</dt> <dd>Save the current position and size of the main window so next time @@ -1519,7 +1519,7 @@ </dl> </div> <div class="section"> -<h4><a class="toc-backref" href="#id66" id="projects" name="projects">Projects</a></h4> +<h4><a class="toc-backref" href="#id70" id="projects" name="projects">Projects</a></h4> <dl class="docutils"> <dt>Use project-based session files</dt> <dd>Save your current session when closing projects. You will be able to @@ -1528,7 +1528,7 @@ </dl> </div> <div class="section"> -<h4><a class="toc-backref" href="#id67" id="miscellaneous" name="miscellaneous">Miscellaneous</a></h4> +<h4><a class="toc-backref" href="#id71" id="miscellaneous" name="miscellaneous">Miscellaneous</a></h4> <dl class="docutils"> <dt>Beep on errors when compilation has finished</dt> <dd>Have the computer make a beeping sound when compilation of your program @@ -1546,10 +1546,10 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id68" id="interface-tab-in-preferences-dialog" name="interface-tab-in-preferences-dialog">Interface tab in preferences dialog</a></h3> +<h3><a class="toc-backref" href="#id72" id="interface-tab-in-preferences-dialog" name="interface-tab-in-preferences-dialog">Interface tab in preferences dialog</a></h3> <img alt="./images/pref_dialog_interface.png" src="./images/pref_dialog_interface.png" /> <div class="section"> -<h4><a class="toc-backref" href="#id69" id="sidebar" name="sidebar">Sidebar</a></h4> +<h4><a class="toc-backref" href="#id73" id="sidebar" name="sidebar">Sidebar</a></h4> <dl class="docutils"> <dt>Show symbol list</dt> <dd>Show the list of functions, variables, and other information in the @@ -1564,7 +1564,7 @@ </dl> </div> <div class="section"> -<h4><a class="toc-backref" href="#id70" id="fonts" name="fonts">Fonts</a></h4> +<h4><a class="toc-backref" href="#id74" id="fonts" name="fonts">Fonts</a></h4> <dl class="docutils"> <dt>Editor</dt> <dd>Change the font used to display documents.</dd> @@ -1575,7 +1575,7 @@ </dl> </div> <div class="section"> -<h4><a class="toc-backref" href="#id71" id="editor-tabs" name="editor-tabs">Editor tabs</a></h4> +<h4><a class="toc-backref" href="#id75" id="editor-tabs" name="editor-tabs">Editor tabs</a></h4> <dl class="docutils"> <dt>Show editor tabs</dt> <dd>Show a notebook tab for all documents so you can switch between them @@ -1589,7 +1589,7 @@ </dl> </div> <div class="section"> -<h4><a class="toc-backref" href="#id72" id="tab-positions" name="tab-positions">Tab positions</a></h4> +<h4><a class="toc-backref" href="#id76" id="tab-positions" name="tab-positions">Tab positions</a></h4> <dl class="docutils"> <dt>Editor</dt> <dd>Set the positioning of the editor's notebook tabs to the right, @@ -1603,7 +1603,7 @@ </dl> </div> <div class="section"> -<h4><a class="toc-backref" href="#id73" id="id2" name="id2">Miscellaneous</a></h4> +<h4><a class="toc-backref" href="#id77" id="id2" name="id2">Miscellaneous</a></h4> <dl class="docutils"> <dt>Show status bar</dt> <dd>Show the status bar at the bottom of the main window. It gives information about @@ -1613,18 +1613,18 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id74" id="toolbar-tab-in-preferences-dialog" name="toolbar-tab-in-preferences-dialog">Toolbar tab in preferences dialog</a></h3> +<h3><a class="toc-backref" href="#id78" id="toolbar-tab-in-preferences-dialog" name="toolbar-tab-in-preferences-dialog">Toolbar tab in preferences dialog</a></h3> <p>Affects the main toolbar underneath the menu bar.</p> <img alt="./images/pref_dialog_toolbar.png" src="./images/pref_dialog_toolbar.png" /> <div class="section"> -<h4><a class="toc-backref" href="#id75" id="toolbar" name="toolbar">Toolbar</a></h4> +<h4><a class="toc-backref" href="#id79" id="toolbar" name="toolbar">Toolbar</a></h4> <dl class="docutils"> <dt>Show Toolbar</dt> <dd>Whether to show the toolbar.</dd> </dl> </div> <div class="section"> -<h4><a class="toc-backref" href="#id76" id="items" name="items">Items</a></h4> +<h4><a class="toc-backref" href="#id80" id="items" name="items">Items</a></h4> <dl class="docutils"> <dt>Show file operation buttons</dt> <dd>Show the buttons to open a new file, open an existing file, save a file, @@ -1654,7 +1654,7 @@ </dl> </div> <div class="section"> -<h4><a class="toc-backref" href="#id77" id="appearance" name="appearance">Appearance</a></h4> +<h4><a class="toc-backref" href="#id81" id="appearance" name="appearance">Appearance</a></h4> <dl class="docutils"> <dt>Icon Style</dt> <dd>Select the toolbar icon style to use - either icons and text, just @@ -1665,10 +1665,10 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id78" id="editor-features-tab-in-preferences-dialog" name="editor-features-tab-in-preferences-dialog">Editor Features tab in preferences dialog</a></h3> +<h3><a class="toc-backref" href="#id82" id="editor-features-tab-in-preferences-dialog" name="editor-features-tab-in-preferences-dialog">Editor Features tab in preferences dialog</a></h3> <img alt="./images/pref_dialog_edit.png" src="./images/pref_dialog_edit.png" /> <div class="section"> -<h4><a class="toc-backref" href="#id79" id="indentation-group" name="indentation-group">Indentation group</a></h4> +<h4><a class="toc-backref" href="#id83" id="indentation-group" name="indentation-group">Indentation group</a></h4> <p>See <a class="reference" href="#indentation">Indentation</a> for more information.</p> <dl class="docutils"> <dt>Type</dt> @@ -1693,7 +1693,7 @@ </dl> </div> <div class="section"> -<h4><a class="toc-backref" href="#id80" id="features" name="features">Features</a></h4> +<h4><a class="toc-backref" href="#id84" id="features" name="features">Features</a></h4> <dl class="docutils"> <dt>Line wrapping</dt> <dd>Show long lines wrapped around to new display lines.</dd> @@ -1722,7 +1722,7 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id81" id="editor-completions-tab-in-preferences-dialog" name="editor-completions-tab-in-preferences-dialog">Editor Completions tab in preferences dialog</a></h3> +<h3><a class="toc-backref" href="#id85" id="editor-completions-tab-in-preferences-dialog" name="editor-completions-tab-in-preferences-dialog">Editor Completions tab in preferences dialog</a></h3> <dl class="docutils"> <dt>Snippet Completion</dt> <dd>Whether to replace special keywords after typing Tab into a @@ -1758,11 +1758,11 @@ </dl> </div> <div class="section"> -<h3><a class="toc-backref" href="#id82" id="editor-display-tab-in-preferences-dialog" name="editor-display-tab-in-preferences-dialog">Editor Display tab in preferences dialog</a></h3> +<h3><a class="toc-backref" href="#id86" id="editor-display-tab-in-preferences-dialog" name="editor-display-tab-in-preferences-dialog">Editor Display tab in preferences dialog</a></h3> <p>This is for visual elements displayed in the editor window.</p> <img alt="./images/pref_dialog_display.png" src="./images/pref_dialog_display.png" /> <div class="section"> -<h4><a class="toc-backref" href="#id83" id="display" name="display">Display</a></h4> +<h4><a class="toc-backref" href="#id87" id="display" name="display">Display</a></h4> <dl class="docutils"> <dt>Show indendation guides</dt> <dd>Show vertical lines to help show how much leading indentation there @@ -1776,7 +1776,7 @@ </dl> </div> <div class="section"> -<h4><a class="toc-backref" href="#id84" id="long-line-marker" name="long-line-marker">Long line marker</a></h4> +<h4><a class="toc-backref" href="#id88" id="long-line-marker" name="long-line-marker">Long line marker</a></h4> <p>The long line marker helps to indicate overly-long lines, or as a hint to the user for when to break the line.</p> <dl class="docutils"> @@ -1802,10 +1802,10 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id85" id="files-tab-in-preferences-dialog" name="files-tab-in-preferences-dialog">Files tab in preferences dialog</a></h3> +<h3><a class="toc-backref" href="#id89" id="files-tab-in-preferences-dialog" name="files-tab-in-preferences-dialog">Files tab in preferences dialog</a></h3> <img alt="./images/pref_dialog_files.png" src="./images/pref_dialog_files.png" /> <div class="section"> -<h4><a class="toc-backref" href="#id86" id="new-files" name="new-files">New files</a></h4> +<h4><a class="toc-backref" href="#id90" id="new-files" name="new-files">New files</a></h4> <dl class="docutils"> <dt>Default encoding (new files)</dt> <dd>The type of file encoding you wish to use when creating files.</dd> @@ -1822,7 +1822,7 @@ </dl> </div> <div class="section"> -<h4><a class="toc-backref" href="#id87" id="saving-files" name="saving-files">Saving files</a></h4> +<h4><a class="toc-backref" href="#id91" id="saving-files" name="saving-files">Saving files</a></h4> <p>Perform special formatting operations when a document is saved. These can each be undone with the Undo command as usual.</p> <dl class="docutils"> @@ -1841,7 +1841,7 @@ </dl> </div> <div class="section"> -<h4><a class="toc-backref" href="#id88" id="id3" name="id3">Miscellaneous</a></h4> +<h4><a class="toc-backref" href="#id92" id="id3" name="id3">Miscellaneous</a></h4> <dl class="docutils"> <dt>Recent files list length</dt> <dd>The number of files to remember in the recently used files list.</dd> @@ -1852,10 +1852,10 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id89" id="tools-tab-in-preferences-dialog" name="tools-tab-in-preferences-dialog">Tools tab in preferences dialog</a></h3> +<h3><a class="toc-backref" href="#id93" id="tools-tab-in-preferences-dialog" name="tools-tab-in-preferences-dialog">Tools tab in preferences dialog</a></h3> <img alt="./images/pref_dialog_tools.png" src="./images/pref_dialog_tools.png" /> <div class="section"> -<h4><a class="toc-backref" href="#id90" id="tool-paths" name="tool-paths">Tool paths</a></h4> +<h4><a class="toc-backref" href="#id94" id="tool-paths" name="tool-paths">Tool paths</a></h4> <dl class="docutils"> <dt>Make</dt> <dd>The location of the make executable.</dd> @@ -1875,7 +1875,7 @@ </div> </div> <div class="section"> -<h4><a class="toc-backref" href="#id91" id="commands" name="commands">Commands</a></h4> +<h4><a class="toc-backref" href="#id95" id="commands" name="commands">Commands</a></h4> <dl class="docutils"> <dt>Context action</dt> <dd>Set this to a command to execute on the current word. @@ -1885,7 +1885,7 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id92" id="template-tab-in-preferences-dialog" name="template-tab-in-preferences-dialog">Template tab in preferences dialog</a></h3> +<h3><a class="toc-backref" href="#id96" id="template-tab-in-preferences-dialog" name="template-tab-in-preferences-dialog">Template tab in preferences dialog</a></h3> <p>This data is used as metadata for various template text to insert into a document, such as the file header. You only need to set fields that you want to use in your template files.</p> @@ -1895,7 +1895,7 @@ </div> <img alt="./images/pref_dialog_templ.png" src="./images/pref_dialog_templ.png" /> <div class="section"> -<h4><a class="toc-backref" href="#id93" id="template-data" name="template-data">Template data</a></h4> +<h4><a class="toc-backref" href="#id97" id="template-data" name="template-data">Template data</a></h4> <dl class="docutils"> <dt>Developer</dt> <dd>The name of the developer who will be creating files.</dd> @@ -1912,11 +1912,23 @@ <dd>The company the developer is working for.</dd> <dt>Initial version</dt> <dd>The initial version of files you will be creating.</dd> +<dt>Year</dt> +<dd>Specify a format for the the {year} wildcard. You can use any conversion specifiers +which can be used with the ANSI C strftime function. For details please see +<a class="reference" href="http://man.cx/strftime">http://man.cx/strftime</a>.</dd> +<dt>Date</dt> +<dd>Specify a format for the the {date} wildcard. You can use any conversion specifiers +which can be used with the ANSI C strftime function. For details please see +<a class="reference" href="http://man.cx/strftime">http://man.cx/strftime</a>.</dd> +<dt>Date & Time</dt> +<dd>Specify a format for the the {datetime} wildcard. You can use any conversion specifiers +which can be used with the ANSI C strftime function. For details please see +<a class="reference" href="http://man.cx/strftime">http://man.cx/strftime</a>.</dd> </dl> </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id94" id="keybinding-tab-in-preferences-dialog" name="keybinding-tab-in-preferences-dialog">Keybinding tab in preferences dialog</a></h3> +<h3><a class="toc-backref" href="#id98" id="keybinding-tab-in-preferences-dialog" name="keybinding-tab-in-preferences-dialog">Keybinding tab in preferences dialog</a></h3> <img alt="./images/pref_dialog_keys.png" src="./images/pref_dialog_keys.png" /> <p>There are some handy commands in here that are not, by default, bound to a key combination, and may not be available as a menu item.</p> @@ -1926,7 +1938,7 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id95" id="printing-tab-in-preferences-dialog" name="printing-tab-in-preferences-dialog">Printing tab in preferences dialog</a></h3> +<h3><a class="toc-backref" href="#id99" id="printing-tab-in-preferences-dialog" name="printing-tab-in-preferences-dialog">Printing tab in preferences dialog</a></h3> <img alt="./images/pref_dialog_printing.png" src="./images/pref_dialog_printing.png" /> <dl class="docutils"> <dt>Use external command for printing</dt> @@ -1948,11 +1960,11 @@ </dl> </div> <div class="section"> -<h3><a class="toc-backref" href="#id96" id="vte-tab-in-preferences-dialog" name="vte-tab-in-preferences-dialog">VTE tab in preferences dialog</a></h3> +<h3><a class="toc-backref" href="#id100" id="vte-tab-in-preferences-dialog" name="vte-tab-in-preferences-dialog">VTE tab in preferences dialog</a></h3> <p>See also: <a class="reference" href="#virtual-terminal-emulator-widget-vte">Virtual terminal emulator widget (VTE)</a>.</p> <img alt="./images/pref_dialog_vte.png" src="./images/pref_dialog_vte.png" /> <div class="section"> -<h4><a class="toc-backref" href="#id97" id="terminal-widget" name="terminal-widget">Terminal widget</a></h4> +<h4><a class="toc-backref" href="#id101" id="terminal-widget" name="terminal-widget">Terminal widget</a></h4> <dl class="docutils"> <dt>Terminal font</dt> <dd>Select the font that will be used in the terminal emulation control.</dd> @@ -1993,7 +2005,7 @@ </div> </div> <div class="section"> -<h2><a class="toc-backref" href="#id98" id="project-management" name="project-management">Project Management</a></h2> +<h2><a class="toc-backref" href="#id102" id="project-management" name="project-management">Project Management</a></h2> <p>Project Management is optional in Geany. Currently it can be used for:</p> <ul class="simple"> <li>Storing and opening session files on a project basis.</li> @@ -2011,7 +2023,7 @@ file that was in use at the end of the last session will be reopened.</p> <p>Below are the commands used to create, modify, open and close projects.</p> <div class="section"> -<h3><a class="toc-backref" href="#id99" id="new-project" name="new-project">New Project</a></h3> +<h3><a class="toc-backref" href="#id103" id="new-project" name="new-project">New Project</a></h3> <p>To create a new project, fill in the <em>Name</em> field. By default this will setup a new project file <tt class="docutils literal"><span class="pre">~/projects/name.geany</span></tt>. Usually it's best to store all your project files in the same directory (they are @@ -2021,7 +2033,7 @@ structure contained in it.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id100" id="project-properties" name="project-properties">Project Properties</a></h3> +<h3><a class="toc-backref" href="#id104" id="project-properties" name="project-properties">Project Properties</a></h3> <p>You can set an optional description for the project, but it is not used elsewhere by Geany.</p> <p>The <em>Base path</em> field is used as the directory to run the Make and Make @@ -2030,13 +2042,13 @@ The specified path can be an absolute path or relative to the project's file name.</p> <div class="section"> -<h4><a class="toc-backref" href="#id101" id="make-in-base-path" name="make-in-base-path">Make in base path</a></h4> +<h4><a class="toc-backref" href="#id105" id="make-in-base-path" name="make-in-base-path">Make in base path</a></h4> <p>This setting makes the <em>Build->Make</em> command use the project's base path. Uncheck this if you want to use the current file's directory instead.</p> </div> <div class="section"> -<h4><a class="toc-backref" href="#id102" id="run-command" name="run-command">Run command</a></h4> +<h4><a class="toc-backref" href="#id106" id="run-command" name="run-command">Run command</a></h4> <p>The <em>Run command</em> overrides the default run command. You can set this to the executable or main script file for the project, and append any command-line arguments.</p> @@ -2049,7 +2061,7 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id103" id="open-project" name="open-project">Open Project</a></h3> +<h3><a class="toc-backref" href="#id107" id="open-project" name="open-project">Open Project</a></h3> <p>The Open command displays a standard file chooser, starting in <tt class="docutils literal"><span class="pre">~/projects</span></tt>. Choose a project file named with the <tt class="docutils literal"><span class="pre">.geany</span></tt> extension.</p> @@ -2057,14 +2069,14 @@ open files and open the session files associated with the project.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id104" id="close-project" name="close-project">Close Project</a></h3> +<h3><a class="toc-backref" href="#id108" id="close-project" name="close-project">Close Project</a></h3> <p>Project file settings are saved when the project is closed.</p> <p>When project session support is enabled, Geany will close the project session files and open any previously closed default session files.</p> </div> </div> <div class="section"> -<h2><a class="toc-backref" href="#id105" id="build-system" name="build-system">Build system</a></h2> +<h2><a class="toc-backref" href="#id109" id="build-system" name="build-system">Build system</a></h2> <p>Geany has an integrated build system. Firstly this means that the current source file will be saved before it is processed. This is for convenience so that you don't need to keep saving small changes @@ -2088,7 +2100,7 @@ <li>Set Includes and Arguments</li> </ul> <div class="section"> -<h3><a class="toc-backref" href="#id106" id="compile" name="compile">Compile</a></h3> +<h3><a class="toc-backref" href="#id110" id="compile" name="compile">Compile</a></h3> <p>The Compile command has different uses for different kinds of files.</p> <p>For compilable languages such as C and C++, the Compile command is setup to compile the current source file into a binary object file.</p> @@ -2098,7 +2110,7 @@ will run the file in its language interpreter.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id107" id="build" name="build">Build</a></h3> +<h3><a class="toc-backref" href="#id111" id="build" name="build">Build</a></h3> <p>For compilable languages such as C and C++, the Build command will link the current source file's equivalent object file into an executable. If the object file does not exist, the source will be compiled and linked @@ -2106,7 +2118,7 @@ <p>Interpreted languages do not use the Build command.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id108" id="make-all" name="make-all">Make all</a></h3> +<h3><a class="toc-backref" href="#id112" id="make-all" name="make-all">Make all</a></h3> <p>This effectively runs "make all" in the same directory as the current file.</p> <div class="note"> @@ -2116,19 +2128,19 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id109" id="make-custom-target" name="make-custom-target">Make custom target</a></h3> +<h3><a class="toc-backref" href="#id113" id="make-custom-target" name="make-custom-target">Make custom target</a></h3> <p>This is similar to running 'Make all' but you will be prompted for the make target name to be passed to the Make tool. For example, typing 'clean' in the dialog prompt will run "make clean".</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id110" id="make-object" name="make-object">Make object</a></h3> +<h3><a class="toc-backref" href="#id114" id="make-object" name="make-object">Make object</a></h3> <p>Make object will run "make current_file.o" in the same directory as the current file, using its prefix for 'current_file'. It is useful for compiling just the current file without building the whole project.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id111" id="execute" name="execute">Execute</a></h3> +<h3><a class="toc-backref" href="#id115" id="execute" name="execute">Execute</a></h3> <p>Execute will run the corresponding executable file, shell script or interpreted script in a terminal window. Note that the Terminal tool path must be correctly set in the Tools tab of the Preferences dialog - @@ -2139,7 +2151,7 @@ output from the program before the terminal window is closed.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id112" id="stopping-running-processes" name="stopping-running-processes">Stopping running processes</a></h3> +<h3><a class="toc-backref" href="#id116" id="stopping-running-processes" name="stopping-running-processes">Stopping running processes</a></h3> <p>When there is a running program, the Run button in the toolbar becomes a stop button and you can stop the current action. This works by sending a signal to the process (and its child process(es)) @@ -2148,7 +2160,7 @@ cannot be stopped. This can happen when the process creates more than one child process.</p> <div class="section"> -<h4><a class="toc-backref" href="#id113" id="terminal-emulators" name="terminal-emulators">Terminal emulators</a></h4> +<h4><a class="toc-backref" href="#id117" id="terminal-emulators" name="terminal-emulators">Terminal emulators</a></h4> <p>Xterm is known to work properly. If you are using "Terminal" (the terminal program of Xfce), you should add the command line option <tt class="docutils literal"><span class="pre">--disable-server</span></tt> otherwise the started process cannot be @@ -2157,7 +2169,7 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id114" id="set-includes-and-arguments" name="set-includes-and-arguments">Set Includes and Arguments</a></h3> +<h3><a class="toc-backref" href="#id118" id="set-includes-and-arguments" name="set-includes-and-arguments">Set Includes and Arguments</a></h3> <p>By default the Compile and Build commands invoke the compiler and linker with only the basic arguments needed by all programs. Using Set Includes and Arguments you can add any include paths and compile @@ -2174,14 +2186,14 @@ different settings, then writing a Makefile and using the Make commands is recommended.</p> <div class="section"> -<h4><a class="toc-backref" href="#id115" id="one-step-compilation" name="one-step-compilation">One step compilation</a></h4> +<h4><a class="toc-backref" href="#id119" id="one-step-compilation" name="one-step-compilation">One step compilation</a></h4> <p>If you are using the Build command to compile and link in one step, you will need to set both the compiler arguments and the linker arguments in the linker command setting.</p> </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id116" id="indicators" name="indicators">Indicators</a></h3> +<h3><a class="toc-backref" href="#id120" id="indicators" name="indicators">Indicators</a></h3> <p>Indicators are red squiggly underlines which are used to highlight errors which occured while compiling the current file. So you can easily see where your code failed to compile. To remove the indicators, @@ -2191,7 +2203,7 @@ </div> </div> <div class="section"> -<h2><a class="toc-backref" href="#id117" id="printing-support" name="printing-support">Printing support</a></h2> +<h2><a class="toc-backref" href="#id121" id="printing-support" name="printing-support">Printing support</a></h2> <p>Since Geany 0.13 there is full printing support using GTK's printing API. The printed page(s) will look nearly the same as on your screen in Geany. Additionally, there are some options to modify the printed page(s). You @@ -2239,7 +2251,7 @@ gtklp or similar programs can be used.</p> </div> <div class="section"> -<h2><a class="toc-backref" href="#id118" id="plugins" name="plugins">Plugins</a></h2> +<h2><a class="toc-backref" href="#id122" id="plugins" name="plugins">Plugins</a></h2> <p>Plugins are loaded at startup, if the <em>Enable plugin support</em> general preference is set. There is also a command-line option, <tt class="docutils literal"><span class="pre">-p</span></tt>, which prevents plugins being loaded. Plugins are scanned in @@ -2259,13 +2271,13 @@ provides some.</p> </div> <div class="section"> -<h2><a class="toc-backref" href="#id119" id="keybindings" name="keybindings">Keybindings</a></h2> +<h2><a class="toc-backref" href="#id123" id="keybindings" name="keybindings">Keybindings</a></h2> <p>Geany supports the default keyboard shortcuts for the Scintilla editing widget. For a list of these commands, see <a class="reference" href="#scintilla-keyboard-commands">Scintilla keyboard commands</a>. The Scintilla keyboard shortcuts will be overridden by any custom keybindings with the same keyboard shortcut.</p> <div class="section"> -<h3><a class="toc-backref" href="#id120" id="switching-documents" name="switching-documents">Switching documents</a></h3> +<h3><a class="toc-backref" href="#id124" id="switching-documents" name="switching-documents">Switching documents</a></h3> <p>There are a few non-configurable bindings to switch between documents, listed below. These can also be overridden by custom keybindings.</p> <table border="1" class="docutils"> @@ -2295,7 +2307,7 @@ </table> </div> <div class="section"> -<h3><a class="toc-backref" href="#id121" id="configurable-keybindings" name="configurable-keybindings">Configurable keybindings</a></h3> +<h3><a class="toc-backref" href="#id125" id="configurable-keybindings" name="configurable-keybindings">Configurable keybindings</a></h3> <p>For all actions listed below you can define your own keybindings. Open the Preferences dialog, select the desired action and click on change. In the opening dialog you can press any key combination you @@ -2843,9 +2855,9 @@ </div> </div> <div class="section"> -<h1><a class="toc-backref" href="#id122" id="configuration-files" name="configuration-files">Configuration files</a></h1> +<h1><a class="toc-backref" href="#id126" id="configuration-files" name="configuration-files">Configuration files</a></h1> <div class="section"> -<h2><a class="toc-backref" href="#id123" id="global-configuration-file" name="global-configuration-file">Global configuration file</a></h2> +<h2><a class="toc-backref" href="#id127" id="global-configuration-file" name="global-configuration-file">Global configuration file</a></h2> <p>You can use a global configuration file for Geany which will be used if the user starts Geany for the first time and an user's configuration file was not yet created or in case an user deleted the configuration @@ -2865,7 +2877,7 @@ </div> </div> <div class="section"> -<h2><a class="toc-backref" href="#id124" id="filetype-definition-files" name="filetype-definition-files">Filetype definition files</a></h2> +<h2><a class="toc-backref" href="#id128" id="filetype-definition-files" name="filetype-definition-files">Filetype definition files</a></h2> <p>All colour definitions and other filetype specific settings are stored in the filetype definition files. Those settings are colours for syntax highlighting, general settings like comment characters or @@ -2893,9 +2905,9 @@ to change. All missing settings will be read from the corresponding global definition file in <tt class="docutils literal"><span class="pre">$prefix/share/geany</span></tt>.</p> <div class="section"> -<h3><a class="toc-backref" href="#id125" id="format" name="format">Format</a></h3> +<h3><a class="toc-backref" href="#id129" id="format" name="format">Format</a></h3> <div class="section"> -<h4><a class="toc-backref" href="#id126" id="styling-section" name="styling-section">[styling] Section</a></h4> +<h4><a class="toc-backref" href="#id130" id="styling-section" name="styling-section">[styling] Section</a></h4> <p>In this section the colours for syntax highlighting are defined. The format is always: key=forground_colour;background_colour;bold;italic</p> <p>Colours have to be specified as RGB hex values prefixed by @@ -2905,7 +2917,7 @@ value is something other than "true" or "false", "false" is assumed.</p> </div> <div class="section"> -<h4><a class="toc-backref" href="#id127" id="keywords-section" name="keywords-section">[keywords] Section</a></h4> +<h4><a class="toc-backref" href="#id131" id="keywords-section" name="keywords-section">[keywords] Section</a></h4> <p>This section contains keys for different keyword lists specific to the filetype. Some filetypes do not support keywords, so adding a new key will not work. You can only add or remove keywords to/from @@ -2916,7 +2928,7 @@ </div> </div> <div class="section"> -<h4><a class="toc-backref" href="#id128" id="settings-section" name="settings-section">[settings] Section</a></h4> +<h4><a class="toc-backref" href="#id132" id="settings-section" name="settings-section">[settings] Section</a></h4> <dl class="docutils"> <dt>extension</dt> <dd><p class="first">This is the default file extension used when saving files, not @@ -2977,7 +2989,7 @@ </dl> </div> <div class="section"> -<h4><a class="toc-backref" href="#id129" id="build-settings-section" name="build-settings-section">[build_settings] Section</a></h4> +<h4><a class="toc-backref" href="#id133" id="build-settings-section" name="build-settings-section">[build_settings] Section</a></h4> <dl class="docutils"> <dt>compiler</dt> <dd><p class="first">This item specifies the command to compile source code files. But @@ -3010,7 +3022,7 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id130" id="special-file-filetypes-common" name="special-file-filetypes-common">Special file filetypes.common</a></h3> +<h3><a class="toc-backref" href="#id134" id="special-file-filetypes-common" name="special-file-filetypes-common">Special file filetypes.common</a></h3> <p>There is a special filetype definition file called filetypes.common. This file defines some general non-filetype-specific settings.</p> @@ -3176,7 +3188,7 @@ </div> </div> <div class="section"> -<h2><a class="toc-backref" href="#id131" id="filetype-extensions" name="filetype-extensions">Filetype extensions</a></h2> +<h2><a class="toc-backref" href="#id135" id="filetype-extensions" name="filetype-extensions">Filetype extensions</a></h2> <p>To change the default filetype extension used when saving a new file, see <a class="reference" href="#filetype-definition-files">Filetype definition files</a>.</p> <p>You can override the list of file extensions that Geany uses for each @@ -3202,7 +3214,7 @@ </pre> </div> <div class="section"> -<h2><a class="toc-backref" href="#id132" id="templates" name="templates">Templates</a></h2> +<h2><a class="toc-backref" href="#id136" id="templates" name="templates">Templates</a></h2> <p>Geany supports the following templates:</p> <ul class="simple"> <li>ChangeLog entry</li> @@ -3225,7 +3237,7 @@ function description won't contain the correct function name but "unknown" instead.</p> <div class="section"> -<h3><a class="toc-backref" href="#id133" id="template-metadata" name="template-metadata">Template metadata</a></h3> +<h3><a class="toc-backref" href="#id137" id="template-metadata" name="template-metadata">Template metadata</a></h3> <p>Metadata can be used with all templates, but by default user set metadata is only used for the ChangeLog and File header templates.</p> <p>In the configuration dialog you can find a tab "Templates" (see @@ -3235,7 +3247,7 @@ at startup.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id134" id="file-templates" name="file-templates">File templates</a></h3> +<h3><a class="toc-backref" href="#id138" id="file-templates" name="file-templates">File templates</a></h3> <p>File templates are templates used as the basis of a new file. To use them, choose the <em>New (with Template)</em> menu item from the <em>File</em> menu.</p> @@ -3247,7 +3259,7 @@ be placed anywhere, but is usually on the first line of the file, followed by a blank line.</p> <div class="section"> -<h4><a class="toc-backref" href="#id135" id="custom-file-templates" name="custom-file-templates">Custom file templates</a></h4> +<h4><a class="toc-backref" href="#id139" id="custom-file-templates" name="custom-file-templates">Custom file templates</a></h4> <p>These are read from the <tt class="docutils literal"><span class="pre">~/.geany/templates/files</span></tt> directory (created the first time Geany is started). The filetype to use is detected from the template file's extension, if any. For example, creating a file @@ -3258,7 +3270,7 @@ template.</p> </div> <div class="section"> -<h4><a class="toc-backref" href="#id136" id="filetype-templates" name="filetype-templates">Filetype templates</a></h4> +<h4><a class="toc-backref" href="#id140" id="filetype-templates" name="filetype-templates">Filetype templates</a></h4> <p>Filetype template files are read from the <tt class="docutils literal"><span class="pre">~/.geany/templates</span></tt> directory, and are named "filetype." followed by the filetype name, e.g. "filetype.python", "filetype.sh", etc. If you are @@ -3270,7 +3282,7 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id137" id="customizing-templates" name="customizing-templates">Customizing templates</a></h3> +<h3><a class="toc-backref" href="#id141" id="customizing-templates" name="customizing-templates">Customizing templates</a></h3> <p>Each template can be customized to your needs. The templates are stored in the <tt class="docutils literal"><span class="pre">~/.geany/templates/</span></tt> directory (see the section called <a class="reference" href="#command-line-options">Command line options</a> for further information about the configuration @@ -3278,7 +3290,7 @@ Geany ;-) ) and edit the template to your needs. There are some wildcards which will be automatically replaced by Geany at startup.</p> <div class="section"> -<h4><a class="toc-backref" href="#id138" id="template-wildcards" name="template-wildcards">Template wildcards</a></h4> +<h4><a class="toc-backref" href="#id142" id="template-wildcards" name="template-wildcards">Template wildcards</a></h4> <p>All wildcards must be enclosed by "{" and "}", e.g. {date}.</p> <table border="1" class="docutils"> <colgroup> @@ -3317,8 +3329,8 @@ description, ChangeLog entry, bsd, gpl, snippets</td> </tr> -<tr><td>year</td> -<td>The current year in the format: YYYY.</td> +<tr><td>year <a class="footnote-reference" href="#id7" id="id4" name="id4">[1]</a></td> +<td>The current year. Default format is: YYYY</td> <td>filetypes, file header, function description, ChangeLog entry, bsd, gpl, snippets</td> @@ -3329,8 +3341,8 @@ description, ChangeLog entry, bsd, gpl, snippets</td> </tr> -<tr><td>date</td> -<td>The current date in the format: YYYY-MM-DD.</td> +<tr><td>date <a class="footnote-reference" href="#id7" id="id5" name="id5">[1]</a></td> +<td>The current date. Default format: YYYY-MM-DD.</td> <td>filetypes, file header, function description, ChangeLog entry, bsd, gpl, snippets</td> @@ -3350,8 +3362,8 @@ description, ChangeLog entry, bsd, gpl, snippets</td> </tr> -<tr><td>datetime</td> -<td>The current date and time in the format: +<tr><td>datetime <a class="footnote-reference" href="#id7" id="id6" name="id6">[1]</a></td> +<td>The current date and time. Default format: DD.MM.YYYY HH:mm:ss ZZZZ.</td> <td>file header, function description, snippets</td> @@ -3383,12 +3395,21 @@ </tr> </tbody> </table> +<table class="docutils footnote" frame="void" id="id7" rules="none"> +<colgroup><col class="label" /><col /></colgroup> +<tbody valign="top"> +<tr><td class="label"><a name="id7">[1]</a></td><td><em>(<a class="fn-backref" href="#id4">1</a>, <a class="fn-backref" href="#id5">2</a>, <a class="fn-backref" href="#id6">3</a>)</em> The format for the <tt class="docutils literal"><span class="pre">year</span></tt>, <tt class="docutils literal"><span class="pre">date</span></tt> and <tt class="docutils literal"><span class="pre">datetime</span></tt> wildcards can be changed +in the preferences dialog, see <a class="reference" href="#template-tab-in-preferences-dialog">Template tab in preferences dialog</a>. You can +use any conversion specifiers which can be used with the ANSI C strftime function. +For details please see <a class="reference" href="http://man.cx/strftime">http://man.cx/strftime</a>.</td></tr> +</tbody> +</table> </div> </div> </div> </div> <div class="section"> -<h1><a class="toc-backref" href="#id139" id="contributing-to-this-document" name="contributing-to-this-document">Contributing to this document</a></h1> +<h1><a class="toc-backref" href="#id143" id="contributing-to-this-document" name="contributing-to-this-document">Contributing to this document</a></h1> <p>This document (<tt class="docutils literal"><span class="pre">geany.txt</span></tt>) is written in <a class="reference" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> (or "reST"). The source file for it is located in Geany's <tt class="docutils literal"><span class="pre">doc</span></tt> subdirectory. If you intend on making changes, you should grab the @@ -3408,7 +3429,7 @@ and Fedora systems.</p> </div> <div class="section"> -<h1><a class="toc-backref" href="#id140" id="scintilla-keyboard-commands" name="scintilla-keyboard-commands">Scintilla keyboard commands</a></h1> +<h1><a class="toc-backref" href="#id144" id="scintilla-keyboard-commands" name="scintilla-keyboard-commands">Scintilla keyboard commands</a></h1> <p>Copyright © 1998, 2006 Neil Hodgson <neilh(at)scintilla(dot)org></p> <p>This appendix is distributed under the terms of the License for Scintilla and SciTE. A copy of this license can be found in the file @@ -3417,7 +3438,7 @@ Scintilla and SciTE</a>.</p> <p>20 June 2006</p> <div class="section"> -<h2><a class="toc-backref" href="#id141" id="keyboard-commands" name="keyboard-commands">Keyboard commands</a></h2> +<h2><a class="toc-backref" href="#id145" id="keyboard-commands" name="keyboard-commands">Keyboard commands</a></h2> <p>Keyboard commands for Scintilla mostly follow common Windows and GTK+ conventions. All move keys (arrows, page up/down, home and end) allows to extend or reduce the stream selection when holding the @@ -3511,7 +3532,7 @@ </div> </div> <div class="section"> @@ 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

← Newer
1
...
4
5
6
7
8
9
10
11
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits July 2008