Commits August 2008

commits@lists.geany.org

2 participants
70 discussions

by ntrel＠users.sourceforge.net

Revision: 2914 http://geany.svn.sourceforge.net/geany/?rev=2914&view=rev Author: ntrel Date: 2008-08-29 17:00:02 +0000 (Fri, 29 Aug 2008) Log Message: ----------- Add 'Max. symbol name suggestions' autocompletion pref. Edit some autocompletion pref strings. Remove some trailing commas in array initializers (oops). Move GEANY_TOGGLE_MARK, GEANY_MAX_AUTOCOMPLETE_WORDS to keyfile.c. Modified Paths: -------------- trunk/ChangeLog trunk/doc/geany.html trunk/doc/geany.txt trunk/geany.glade trunk/src/editor.c trunk/src/editor.h trunk/src/interface.c trunk/src/keyfile.c trunk/src/prefs.c trunk/src/symbols.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-08-29 12:37:42 UTC (rev 2913) +++ trunk/ChangeLog 2008-08-29 17:00:02 UTC (rev 2914) @@ -5,6 +5,13 @@ Mention that usually building GTK manually is not necessary. Run 'make install' as root. Add some subsection titles. + * src/interface.c, src/prefs.c, src/keyfile.c, src/editor.c, + src/symbols.c, src/editor.h, doc/geany.txt, doc/geany.html, + geany.glade: + Add 'Max. symbol name suggestions' autocompletion pref. + Edit some autocompletion pref strings. + Remove some trailing commas in array initializers (oops). + Move GEANY_TOGGLE_MARK, GEANY_MAX_AUTOCOMPLETE_WORDS to keyfile.c. 2008-08-28 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/doc/geany.html =================================================================== --- trunk/doc/geany.html 2008-08-29 12:37:42 UTC (rev 2913) +++ trunk/doc/geany.html 2008-08-29 17:00:02 UTC (rev 2914) @@ -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-08-27" /> +<meta name="date" content="2008-08-29" /> <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-08-27</td></tr> +<td>2008-08-29</td></tr> <tr><th class="docinfo-name">Version:</th> <td>0.15</td></tr> </tbody> @@ -475,9 +475,9 @@ </pre> <p>You may also want to read the INSTALL file for advanced installation options.</p> -<p>There also some compile time options which can be found in -<tt class="docutils literal"><span class="pre">src/geany.h</span></tt>. Please see <a class="reference" href="#compile-time-options">Compile-time options</a> for more -information.</p> +<ul class="simple"> +<li>See also <a class="reference" href="#compile-time-options">Compile-time options</a>.</li> +</ul> </div> <div class="section"> <h3><a class="toc-backref" href="#id19" id="dynamic-linking-loader-support" name="dynamic-linking-loader-support">Dynamic linking loader support</a></h3> @@ -3793,17 +3793,6 @@ a-z, A-Z, 0-9 and underscore.</td> </tr> -<tr><td>GEANY_TOGGLE_MARK</td> -<td>A string which is used to mark a toggled -comment. -external changes.</td> -<td>"~ "</td> -</tr> -<tr><td>GEANY_MAX_AUTOCOMPLETE_WORDS</td> -<td>How many auto completion suggestions should -Geany provide.</td> -<td>30</td> -</tr> </tbody> </table> </div> @@ -3875,6 +3864,16 @@ <td>The font used in the editor window.</td> <td>"Monospace 10"</td> </tr> +<tr><td>GEANY_TOGGLE_MARK</td> +<td>A string which is used to mark a toggled +comment.</td> +<td>"~ "</td> +</tr> +<tr><td>GEANY_MAX_AUTOCOMPLETE_WORDS</td> +<td>How many auto completion suggestions should +Geany provide.</td> +<td>30</td> +</tr> </tbody> </table> </div> @@ -4245,7 +4244,7 @@ <div class="footer"> <hr class="footer" /> <a class="reference" href="geany.txt">View document source</a>. -Generated on: 2008-08-29 12:35 UTC. +Generated on: 2008-08-29 16:53 UTC. Generated by <a class="reference" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source. </div> Modified: trunk/doc/geany.txt =================================================================== --- trunk/doc/geany.txt 2008-08-29 12:37:42 UTC (rev 2913) +++ trunk/doc/geany.txt 2008-08-29 17:00:02 UTC (rev 2914) @@ -140,9 +140,7 @@ You may also want to read the INSTALL file for advanced installation options. -There also some compile time options which can be found in -``src/geany.h``. Please see `Compile-time options`_ for more -information. +* See also `Compile-time options`_. Dynamic linking loader support ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -3318,11 +3316,6 @@ GEANY_WORDCHARS These characters define word boundaries when a string with: making selections and searching using word a-z, A-Z, 0-9 and matching options. underscore. -GEANY_TOGGLE_MARK A string which is used to mark a toggled "~ " - comment. - external changes. -GEANY_MAX_AUTOCOMPLETE_WORDS How many auto completion suggestions should 30 - Geany provide. ============================== ============================================ ================== keyfile.c @@ -3352,6 +3345,10 @@ open files. GEANY_DEFAULT_FONT_MSG_WINDOW The font used in the messages window. "Sans 9" GEANY_DEFAULT_FONT_EDITOR The font used in the editor window. "Monospace 10" +GEANY_TOGGLE_MARK A string which is used to mark a toggled "~ " + comment. +GEANY_MAX_AUTOCOMPLETE_WORDS How many auto completion suggestions should 30 + Geany provide. ============================== ============================================ ================== Modified: trunk/geany.glade =================================================================== --- trunk/geany.glade 2008-08-29 12:37:42 UTC (rev 2913) +++ trunk/geany.glade 2008-08-29 17:00:02 UTC (rev 2914) @@ -6137,7 +6137,7 @@ <property name="visible">True</property> <property name="tooltip" translatable="yes">Continue automatically multi-line comments in languages like C, C++ and Java when a new line is entered inside such a comment.</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Automatic continuation multi-line comments</property> + <property name="label" translatable="yes">Automatic continuation of multi-line comments</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">False</property> @@ -6175,38 +6175,44 @@ <child> <widget class="GtkTable" id="table14"> <property name="visible">True</property> - <property name="n_rows">2</property> + <property name="n_rows">3</property> <property name="n_columns">2</property> <property name="homogeneous">False</property> <property name="row_spacing">3</property> <property name="column_spacing">12</property> <child> - <widget class="GtkSpinButton" id="spin_symbollistheight"> + <widget class="GtkLabel" id="label223"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Number of rows to display in the auto completion list.</property> - <property name="can_focus">True</property> - <property name="climb_rate">1</property> - <property name="digits">0</property> - <property name="numeric">True</property> - <property name="update_policy">GTK_UPDATE_ALWAYS</property> - <property name="snap_to_ticks">False</property> + <property name="label" translatable="yes">Max. symbol name suggestions:</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> <property name="wrap">False</property> - <property name="adjustment">9 1 99 1 10 10</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">fill</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label205"> + <widget class="GtkLabel" id="label173"> <property name="visible">True</property> - <property name="label" translatable="yes">Characters to type for completion:</property> + <property name="label" translatable="yes">Completion list height:</property> <property name="use_underline">False</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> @@ -6224,17 +6230,17 @@ <packing> <property name="left_attach">0</property> <property name="right_attach">1</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="x_options">fill</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label173"> + <widget class="GtkLabel" id="label205"> <property name="visible">True</property> - <property name="label" translatable="yes">Rows of symbol completion list:</property> + <property name="label" translatable="yes">Characters to type for completion:</property> <property name="use_underline">False</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> @@ -6252,8 +6258,8 @@ <packing> <property name="left_attach">0</property> <property name="right_attach">1</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> <property name="x_options">fill</property> <property name="y_options"></property> </packing> @@ -6280,11 +6286,55 @@ <property name="y_options"></property> </packing> </child> + + <child> + <widget class="GtkSpinButton" id="spin_symbollistheight"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Display height in rows for the auto completion list.</property> + <property name="can_focus">True</property> + <property name="climb_rate">1</property> + <property name="digits">0</property> + <property name="numeric">True</property> + <property name="update_policy">GTK_UPDATE_ALWAYS</property> + <property name="snap_to_ticks">False</property> + <property name="wrap">False</property> + <property name="adjustment">9 1 99 1 10 10</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkSpinButton" id="spin_autocompletion_max_entries"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Maximum number of entries to display in the auto completion list.</property> + <property name="can_focus">True</property> + <property name="climb_rate">1</property> + <property name="digits">0</property> + <property name="numeric">True</property> + <property name="update_policy">GTK_UPDATE_ALWAYS</property> + <property name="snap_to_ticks">False</property> + <property name="wrap">False</property> + <property name="adjustment">9 1 10000 1 10 10</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="y_options"></property> + </packing> + </child> </widget> <packing> <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="expand">False</property> + <property name="fill">False</property> </packing> </child> </widget> Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2008-08-29 12:37:42 UTC (rev 2913) +++ trunk/src/editor.c 2008-08-29 17:00:02 UTC (rev 2914) @@ -1379,9 +1379,10 @@ } +/* Current document & global tags autocompletion */ static gboolean autocomplete_tags(GeanyDocument *doc, const gchar *root, gsize rootlen) -{ /* PHP, LaTeX, C, C++, D and Java tag autocompletion */ +{ TMTagAttrType attrs[] = { tm_tag_attr_name_t, 0 }; const GPtrArray *tags; ScintillaObject *sci; @@ -1396,7 +1397,7 @@ GString *words = g_string_sized_new(150); guint j; - for (j = 0; ((j < tags->len) && (j < GEANY_MAX_AUTOCOMPLETE_WORDS)); ++j) + for (j = 0; ((j < tags->len) && (j < editor_prefs.autocompletion_max_entries)); ++j) { if (j > 0) g_string_append_c(words, '\n'); g_string_append(words, ((TMTag *) tags->pdata[j])->name); Modified: trunk/src/editor.h =================================================================== --- trunk/src/editor.h 2008-08-29 12:37:42 UTC (rev 2913) +++ trunk/src/editor.h 2008-08-29 17:00:02 UTC (rev 2914) @@ -29,9 +29,7 @@ #include "ScintillaWidget.h" #define GEANY_WORDCHARS "_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789" -#define GEANY_TOGGLE_MARK "~ " #define GEANY_MAX_WORD_LENGTH 192 -#define GEANY_MAX_AUTOCOMPLETE_WORDS 30 /* Note: Avoid using SSM in files not related to scintilla, use sciwrappers.h instead. */ #define SSM(s, m, w, l) scintilla_send_message(s, m, w, l) @@ -106,6 +104,7 @@ gint line_break_column; gboolean auto_continue_multiline; gchar *comment_toggle_mark; + guint autocompletion_max_entries; } GeanyEditorPrefs; extern GeanyEditorPrefs editor_prefs; Modified: trunk/src/interface.c =================================================================== --- trunk/src/interface.c 2008-08-29 12:37:42 UTC (rev 2913) +++ trunk/src/interface.c 2008-08-29 17:00:02 UTC (rev 2914) @@ -2731,12 +2731,15 @@ GtkWidget *check_auto_multiline; GtkWidget *check_symbol_auto_completion; GtkWidget *table14; - GtkObject *spin_symbollistheight_adj; - GtkWidget *spin_symbollistheight; + GtkWidget *label223; + GtkWidget *label173; GtkWidget *label205; - GtkWidget *label173; GtkObject *spin_symbol_complete_chars_adj; GtkWidget *spin_symbol_complete_chars; + GtkObject *spin_symbollistheight_adj; + GtkWidget *spin_symbollistheight; + GtkObject *spin_autocompletion_max_entries_adj; + GtkWidget *spin_autocompletion_max_entries; GtkWidget *label177; GtkWidget *label212; GtkWidget *vbox24; @@ -3849,7 +3852,7 @@ gtk_tooltips_set_tip (tooltips, check_xmltag, _("Automatic completion and closing of XML tags (includes HTML tags)"), NULL); gtk_button_set_focus_on_click (GTK_BUTTON (check_xmltag), FALSE); - check_auto_multiline = gtk_check_button_new_with_mnemonic (_("Automatic continuation multi-line comments")); + check_auto_multiline = gtk_check_button_new_with_mnemonic (_("Automatic continuation of multi-line comments")); gtk_widget_show (check_auto_multiline); gtk_box_pack_start (GTK_BOX (vbox19), check_auto_multiline, FALSE, FALSE, 0); gtk_tooltips_set_tip (tooltips, check_auto_multiline, _("Continue automatically multi-line comments in languages like C, C++ and Java when a new line is entered inside such a comment."), NULL); @@ -3861,21 +3864,26 @@ gtk_tooltips_set_tip (tooltips, check_symbol_auto_completion, _("Automatic completion of known symbols in open files (function names, global variables, ...)"), NULL); gtk_button_set_focus_on_click (GTK_BUTTON (check_symbol_auto_completion), FALSE); - table14 = gtk_table_new (2, 2, FALSE); + table14 = gtk_table_new (3, 2, FALSE); gtk_widget_show (table14); - gtk_box_pack_start (GTK_BOX (vbox19), table14, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (vbox19), table14, FALSE, FALSE, 0); gtk_table_set_row_spacings (GTK_TABLE (table14), 3); gtk_table_set_col_spacings (GTK_TABLE (table14), 12); - spin_symbollistheight_adj = gtk_adjustment_new (9, 1, 99, 1, 10, 10); - spin_symbollistheight = gtk_spin_button_new (GTK_ADJUSTMENT (spin_symbollistheight_adj), 1, 0); - gtk_widget_show (spin_symbollistheight); - gtk_table_attach (GTK_TABLE (table14), spin_symbollistheight, 1, 2, 1, 2, - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), + label223 = gtk_label_new (_("Max. symbol name suggestions:")); + gtk_widget_show (label223); + gtk_table_attach (GTK_TABLE (table14), label223, 0, 1, 2, 3, + (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_tooltips_set_tip (tooltips, spin_symbollistheight, _("Number of rows to display in the auto completion list."), NULL); - gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spin_symbollistheight), TRUE); + gtk_misc_set_alignment (GTK_MISC (label223), 0, 0.5); + label173 = gtk_label_new (_("Completion list height:")); + gtk_widget_show (label173); + gtk_table_attach (GTK_TABLE (table14), label173, 0, 1, 1, 2, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_misc_set_alignment (GTK_MISC (label173), 0, 0.5); + label205 = gtk_label_new (_("Characters to type for completion:")); gtk_widget_show (label205); gtk_table_attach (GTK_TABLE (table14), label205, 0, 1, 0, 1, @@ -3883,13 +3891,6 @@ (GtkAttachOptions) (0), 0, 0); gtk_misc_set_alignment (GTK_MISC (label205), 0, 0.5); - label173 = gtk_label_new (_("Rows of symbol completion list:")); - gtk_widget_show (label173); - gtk_table_attach (GTK_TABLE (table14), label173, 0, 1, 1, 2, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment (GTK_MISC (label173), 0, 0.5); - spin_symbol_complete_chars_adj = gtk_adjustment_new (9, 1, 99, 1, 10, 10); spin_symbol_complete_chars = gtk_spin_button_new (GTK_ADJUSTMENT (spin_symbol_complete_chars_adj), 1, 0); gtk_widget_show (spin_symbol_complete_chars); @@ -3899,6 +3900,24 @@ gtk_tooltips_set_tip (tooltips, spin_symbol_complete_chars, _("The amount of characters which are necessary to show the symbol auto completion list."), NULL); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spin_symbol_complete_chars), TRUE); + spin_symbollistheight_adj = gtk_adjustment_new (9, 1, 99, 1, 10, 10); + spin_symbollistheight = gtk_spin_button_new (GTK_ADJUSTMENT (spin_symbollistheight_adj), 1, 0); + gtk_widget_show (spin_symbollistheight); + gtk_table_attach (GTK_TABLE (table14), spin_symbollistheight, 1, 2, 1, 2, + (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_tooltips_set_tip (tooltips, spin_symbollistheight, _("Display height in rows for the auto completion list."), NULL); + gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spin_symbollistheight), TRUE); + + spin_autocompletion_max_entries_adj = gtk_adjustment_new (9, 1, 10000, 1, 10, 10); + spin_autocompletion_max_entries = gtk_spin_button_new (GTK_ADJUSTMENT (spin_autocompletion_max_entries_adj), 1, 0); + gtk_widget_show (spin_autocompletion_max_entries); + gtk_table_attach (GTK_TABLE (table14), spin_autocompletion_max_entries, 1, 2, 2, 3, + (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_tooltips_set_tip (tooltips, spin_autocompletion_max_entries, _("Maximum number of entries to display in the auto completion list."), NULL); + gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spin_autocompletion_max_entries), TRUE); + label177 = gtk_label_new (_("<b>Completions</b>")); gtk_widget_show (label177); gtk_frame_set_label_widget (GTK_FRAME (frame18), label177); @@ -4988,10 +5007,12 @@ GLADE_HOOKUP_OBJECT (prefs_dialog, check_auto_multiline, "check_auto_multiline"); GLADE_HOOKUP_OBJECT (prefs_dialog, check_symbol_auto_completion, "check_symbol_auto_completion"); GLADE_HOOKUP_OBJECT (prefs_dialog, table14, "table14"); - GLADE_HOOKUP_OBJECT (prefs_dialog, spin_symbollistheight, "spin_symbollistheight"); + GLADE_HOOKUP_OBJECT (prefs_dialog, label223, "label223"); + GLADE_HOOKUP_OBJECT (prefs_dialog, label173, "label173"); GLADE_HOOKUP_OBJECT (prefs_dialog, label205, "label205"); - GLADE_HOOKUP_OBJECT (prefs_dialog, label173, "label173"); GLADE_HOOKUP_OBJECT (prefs_dialog, spin_symbol_complete_chars, "spin_symbol_complete_chars"); + GLADE_HOOKUP_OBJECT (prefs_dialog, spin_symbollistheight, "spin_symbollistheight"); + GLADE_HOOKUP_OBJECT (prefs_dialog, spin_autocompletion_max_entries, "spin_autocompletion_max_entries"); GLADE_HOOKUP_OBJECT (prefs_dialog, label177, "label177"); GLADE_HOOKUP_OBJECT (prefs_dialog, label212, "label212"); GLADE_HOOKUP_OBJECT (prefs_dialog, vbox24, "vbox24"); Modified: trunk/src/keyfile.c =================================================================== --- trunk/src/keyfile.c 2008-08-29 12:37:42 UTC (rev 2913) +++ trunk/src/keyfile.c 2008-08-29 17:00:02 UTC (rev 2914) @@ -80,6 +80,8 @@ #define GEANY_DEFAULT_FONT_SYMBOL_LIST "Sans 9" #define GEANY_DEFAULT_FONT_MSG_WINDOW "Sans 9" #define GEANY_DEFAULT_FONT_EDITOR "Monospace 10" +#define GEANY_TOGGLE_MARK "~ " +#define GEANY_MAX_AUTOCOMPLETE_WORDS 30 static gchar *scribble_text = NULL; @@ -118,7 +120,7 @@ {&search_prefs.use_current_word, PACKAGE, "pref_main_search_use_current_word", (gpointer)TRUE}, {&search_prefs.use_current_file_dir, "search", "pref_search_current_file_dir", (gpointer)TRUE}, - {&editor_prefs.indentation->detect_type, PACKAGE, "check_detect_indent", (gpointer)FALSE}, + {&editor_prefs.indentation->detect_type, PACKAGE, "check_detect_indent", (gpointer)FALSE} }; for (i = 0; i < G_N_ELEMENTS(items); i++) @@ -150,6 +152,8 @@ {&editor_prefs.indentation->auto_indent_mode, PACKAGE, "indent_mode", (gpointer)GEANY_AUTOINDENT_CURRENTCHARS}, {&editor_prefs.indentation->type, PACKAGE, "indent_type", (gpointer)GEANY_INDENT_TYPE_TABS}, + {&editor_prefs.autocompletion_max_entries, PACKAGE, "autocompletion_max_entries", + (gpointer)GEANY_MAX_AUTOCOMPLETE_WORDS} }; for (i = 0; i < G_N_ELEMENTS(items); i++) Modified: trunk/src/prefs.c =================================================================== --- trunk/src/prefs.c 2008-08-29 12:37:42 UTC (rev 2913) +++ trunk/src/prefs.c 2008-08-29 17:00:02 UTC (rev 2914) @@ -145,6 +145,7 @@ { {"spin_indent_width", &editor_prefs.indentation->width}, {"spin_tab_width", &editor_prefs.indentation->hard_tab_width}, + {"spin_autocompletion_max_entries", &editor_prefs.autocompletion_max_entries} }; for (i = 0; i < G_N_ELEMENTS(items); i++) @@ -181,7 +182,7 @@ { {"radio_indent_spaces", &editor_prefs.indentation->type, GEANY_INDENT_TYPE_SPACES}, {"radio_indent_tabs", &editor_prefs.indentation->type, GEANY_INDENT_TYPE_TABS}, - {"radio_indent_both", &editor_prefs.indentation->type, GEANY_INDENT_TYPE_BOTH}, + {"radio_indent_both", &editor_prefs.indentation->type, GEANY_INDENT_TYPE_BOTH} }; for (i = 0; i < G_N_ELEMENTS(items); i++) @@ -210,7 +211,7 @@ guint i; PrefEntry items[] = { - {"combo_auto_indent_mode", &editor_prefs.indentation->auto_indent_mode}, + {"combo_auto_indent_mode", &editor_prefs.indentation->auto_indent_mode} }; for (i = 0; i < G_N_ELEMENTS(items); i++) Modified: trunk/src/symbols.c =================================================================== --- trunk/src/symbols.c 2008-08-29 12:37:42 UTC (rev 2913) +++ trunk/src/symbols.c 2008-08-29 17:00:02 UTC (rev 2914) @@ -273,7 +273,7 @@ tm_tag_enum_t | tm_tag_variable_t | tm_tag_macro_t | tm_tag_macro_with_arg_t); if (NULL != tags) { - for (i = 0; ((i < tags->len) && (i < GEANY_MAX_AUTOCOMPLETE_WORDS)); ++i) + for (i = 0; ((i < tags->len) && (i < editor_prefs.autocompletion_max_entries)); ++i) { g_ptr_array_add(ftags, (gpointer) tags->pdata[i]); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

15 years, 3 months

SF.net SVN: geany:[2913] trunk/README

by ntrel＠users.sourceforge.net

Revision: 2913 http://geany.svn.sourceforge.net/geany/?rev=2913&view=rev Author: ntrel Date: 2008-08-29 12:37:42 +0000 (Fri, 29 Aug 2008) Log Message: ----------- See the manual for details. Modified Paths: -------------- trunk/README Modified: trunk/README =================================================================== --- trunk/README 2008-08-29 12:33:44 UTC (rev 2912) +++ trunk/README 2008-08-29 12:37:42 UTC (rev 2913) @@ -43,15 +43,19 @@ Installing Geany is done by the following three commands: $ ./configure $ make -$ make install +(as root) +% make install For more configuration details run $ ./configure --help If there are any errors during compilation, check your build environment -and try to find the error, otherwise contact one of the authors. +and try to find the error, otherwise contact the mailing list or one of +the authors. +See the manual for details (geany.txt/geany.html). + Usage ----- To run Geany just type This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

15 years, 3 months

SF.net SVN: geany:[2912] trunk

by ntrel＠users.sourceforge.net

Revision: 2912 http://geany.svn.sourceforge.net/geany/?rev=2912&view=rev Author: ntrel Date: 2008-08-29 12:33:44 +0000 (Fri, 29 Aug 2008) Log Message: ----------- Separate runtime requirements and build requirements subsections. Mention that usually building GTK manually is not necessary. Run 'make install' as root. Add some subsection titles. Modified Paths: -------------- trunk/ChangeLog trunk/doc/geany.html trunk/doc/geany.txt Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-08-28 16:59:20 UTC (rev 2911) +++ trunk/ChangeLog 2008-08-29 12:33:44 UTC (rev 2912) @@ -1,3 +1,12 @@ +2008-08-29 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * doc/geany.txt, doc/geany.html: + Separate runtime requirements and build requirements subsections. + Mention that usually building GTK manually is not necessary. + Run 'make install' as root. + Add some subsection titles. + + 2008-08-28 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * src/symbols.c: Modified: trunk/doc/geany.html =================================================================== --- trunk/doc/geany.html 2008-08-28 16:59:20 UTC (rev 2911) +++ trunk/doc/geany.html 2008-08-29 12:33:44 UTC (rev 2912) @@ -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-08-14" /> +<meta name="date" content="2008-08-27" /> <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-08-14</td></tr> +<td>2008-08-27</td></tr> <tr><th class="docinfo-name">Version:</th> <td>0.15</td></tr> </tbody> @@ -162,225 +162,231 @@ </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> +<li><a class="reference" href="#binary-packages" id="id16" name="id16">Binary packages</a></li> +<li><a class="reference" href="#source-compilation" id="id17" name="id17">Source compilation</a><ul> +<li><a class="reference" href="#custom-installation" id="id18" name="id18">Custom installation</a></li> +<li><a class="reference" href="#dynamic-linking-loader-support" id="id19" name="id19">Dynamic linking loader support</a></li> +<li><a class="reference" href="#supported-systems" id="id20" name="id20">Supported systems</a></li> +<li><a class="reference" href="#build-problems" id="id21" name="id21">Build problems</a></li> </ul> </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="id26" name="id26">Documents</a><ul> -<li><a class="reference" href="#switching-between-documents" id="id27" name="id27">Switching between documents</a></li> +<li><a class="reference" href="#usage" id="id22" name="id22">Usage</a><ul> +<li><a class="reference" href="#getting-started" id="id23" name="id23">Getting started</a></li> +<li><a class="reference" href="#command-line-options" id="id24" name="id24">Command line options</a></li> +<li><a class="reference" href="#general" id="id25" name="id25">General</a><ul> +<li><a class="reference" href="#startup" id="id26" name="id26">Startup</a></li> +<li><a class="reference" href="#opening-files-from-the-command-line-in-a-running-instance" id="id27" name="id27">Opening files from the command-line in a running instance</a></li> +<li><a class="reference" href="#virtual-terminal-emulator-widget-vte" id="id28" name="id28">Virtual terminal emulator widget (VTE)</a></li> +<li><a class="reference" href="#defining-own-widget-styles-using-gtkrc-2-0" id="id29" name="id29">Defining own widget styles using .gtkrc-2.0</a></li> </ul> </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> +<li><a class="reference" href="#documents" id="id30" name="id30">Documents</a><ul> +<li><a class="reference" href="#switching-between-documents" id="id31" name="id31">Switching between documents</a></li> </ul> </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> +<li><a class="reference" href="#character-sets-and-unicode-byte-order-mark-bom" id="id32" name="id32">Character sets and Unicode Byte-Order-Mark (BOM)</a><ul> +<li><a class="reference" href="#using-character-sets" id="id33" name="id33">Using character sets</a></li> +<li><a class="reference" href="#in-file-encoding-specification" id="id34" name="id34">In-file encoding specification</a></li> +<li><a class="reference" href="#special-encoding-none" id="id35" name="id35">Special encoding "None"</a></li> +<li><a class="reference" href="#unicode-byte-order-mark-bom" id="id36" name="id36">Unicode Byte-Order-Mark (BOM)</a></li> </ul> </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> +<li><a class="reference" href="#editing" id="id37" name="id37">Editing</a><ul> +<li><a class="reference" href="#folding" id="id38" name="id38">Folding</a></li> +<li><a class="reference" href="#column-mode-editing" id="id39" name="id39">Column mode editing</a></li> +<li><a class="reference" href="#drag-and-drop-of-text" id="id40" name="id40">Drag and drop of text</a></li> +<li><a class="reference" href="#indentation" id="id41" name="id41">Indentation</a></li> +<li><a class="reference" href="#auto-indentation" id="id42" name="id42">Auto-indentation</a></li> +<li><a class="reference" href="#bookmarks" id="id43" name="id43">Bookmarks</a></li> +<li><a class="reference" href="#code-navigation-history" id="id44" name="id44">Code Navigation History</a></li> +<li><a class="reference" href="#send-text-through-definable-commands" id="id45" name="id45">Send text through definable commands</a></li> +<li><a class="reference" href="#context-actions" id="id46" name="id46">Context actions</a></li> +<li><a class="reference" href="#user-definable-snippets" id="id47" name="id47">User-definable snippets</a></li> +<li><a class="reference" href="#inserting-unicode-characters" id="id48" name="id48">Inserting unicode characters</a></li> </ul> </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> +<li><a class="reference" href="#search-replace-and-go-to" id="id49" name="id49">Search, replace and go to</a><ul> +<li><a class="reference" href="#find" id="id50" name="id50">Find</a><ul> +<li><a class="reference" href="#matching-options" id="id51" name="id51">Matching options</a></li> +<li><a class="reference" href="#find-all" id="id52" name="id52">Find all</a></li> +<li><a class="reference" href="#change-font-in-search-dialog-text-fields" id="id53" name="id53">Change font in search dialog text fields</a></li> </ul> </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> +<li><a class="reference" href="#find-usage" id="id54" name="id54">Find usage</a></li> +<li><a class="reference" href="#find-in-files" id="id55" name="id55">Find in files</a><ul> +<li><a class="reference" href="#filtering-out-version-control-files" id="id56" name="id56">Filtering out version control files</a></li> </ul> </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> +<li><a class="reference" href="#replace" id="id57" name="id57">Replace</a><ul> +<li><a class="reference" href="#replace-all" id="id58" name="id58">Replace all</a></li> </ul> </li> +<li><a class="reference" href="#go-to-tag-definition" id="id59" name="id59">Go to tag definition</a></li> +<li><a class="reference" href="#go-to-tag-declaration" id="id60" name="id60">Go to tag declaration</a></li> +<li><a class="reference" href="#go-to-line" id="id61" name="id61">Go to line</a></li> +<li><a class="reference" href="#regular-expressions" id="id62" name="id62">Regular expressions</a><ul> +<li><a class="reference" href="#partial-posix-compatibility" id="id63" name="id63">Partial POSIX compatibility</a></li> </ul> </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="id65" name="id65">Ignore tags</a></li> +<li><a class="reference" href="#tags" id="id64" name="id64">Tags</a><ul> +<li><a class="reference" href="#workspace-tags" id="id65" name="id65">Workspace tags</a></li> +<li><a class="reference" href="#global-tags" id="id66" name="id66">Global tags</a><ul> +<li><a class="reference" href="#default-global-tags-files" id="id67" name="id67">Default global tags files</a></li> +<li><a class="reference" href="#generating-a-global-tags-file" id="id68" name="id68">Generating a global tags file</a></li> </ul> </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> +<li><a class="reference" href="#ignore-tags" id="id69" name="id69">Ignore tags</a></li> </ul> </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> +<li><a class="reference" href="#preferences" id="id70" name="id70">Preferences</a><ul> +<li><a class="reference" href="#general-tab-in-preferences-dialog" id="id71" name="id71">General tab in preferences dialog</a><ul> +<li><a class="reference" href="#id1" id="id72" name="id72">Startup</a></li> +<li><a class="reference" href="#shutdown" id="id73" name="id73">Shutdown</a></li> +<li><a class="reference" href="#projects" id="id74" name="id74">Projects</a></li> +<li><a class="reference" href="#miscellaneous" id="id75" name="id75">Miscellaneous</a></li> </ul> </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> +<li><a class="reference" href="#interface-tab-in-preferences-dialog" id="id76" name="id76">Interface tab in preferences dialog</a><ul> +<li><a class="reference" href="#sidebar" id="id77" name="id77">Sidebar</a></li> +<li><a class="reference" href="#fonts" id="id78" name="id78">Fonts</a></li> +<li><a class="reference" href="#editor-tabs" id="id79" name="id79">Editor tabs</a></li> +<li><a class="reference" href="#tab-positions" id="id80" name="id80">Tab positions</a></li> +<li><a class="reference" href="#id2" id="id81" name="id81">Miscellaneous</a></li> </ul> </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> +<li><a class="reference" href="#toolbar-tab-in-preferences-dialog" id="id82" name="id82">Toolbar tab in preferences dialog</a><ul> +<li><a class="reference" href="#toolbar" id="id83" name="id83">Toolbar</a></li> +<li><a class="reference" href="#items" id="id84" name="id84">Items</a></li> +<li><a class="reference" href="#appearance" id="id85" name="id85">Appearance</a></li> </ul> </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> +<li><a class="reference" href="#editor-features-tab-in-preferences-dialog" id="id86" name="id86">Editor Features tab in preferences dialog</a><ul> +<li><a class="reference" href="#indentation-group" id="id87" name="id87">Indentation group</a></li> +<li><a class="reference" href="#features" id="id88" name="id88">Features</a></li> </ul> </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> +<li><a class="reference" href="#editor-completions-tab-in-preferences-dialog" id="id89" name="id89">Editor Completions tab in preferences dialog</a></li> +<li><a class="reference" href="#editor-display-tab-in-preferences-dialog" id="id90" name="id90">Editor Display tab in preferences dialog</a><ul> +<li><a class="reference" href="#display" id="id91" name="id91">Display</a></li> +<li><a class="reference" href="#long-line-marker" id="id92" name="id92">Long line marker</a></li> </ul> </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> +<li><a class="reference" href="#files-tab-in-preferences-dialog" id="id93" name="id93">Files tab in preferences dialog</a><ul> +<li><a class="reference" href="#new-files" id="id94" name="id94">New files</a></li> +<li><a class="reference" href="#saving-files" id="id95" name="id95">Saving files</a></li> +<li><a class="reference" href="#id3" id="id96" name="id96">Miscellaneous</a></li> </ul> </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> +<li><a class="reference" href="#tools-tab-in-preferences-dialog" id="id97" name="id97">Tools tab in preferences dialog</a><ul> +<li><a class="reference" href="#tool-paths" id="id98" name="id98">Tool paths</a></li> +<li><a class="reference" href="#commands" id="id99" name="id99">Commands</a></li> </ul> </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> +<li><a class="reference" href="#template-tab-in-preferences-dialog" id="id100" name="id100">Template tab in preferences dialog</a><ul> +<li><a class="reference" href="#template-data" id="id101" name="id101">Template data</a></li> </ul> </li> +<li><a class="reference" href="#keybinding-tab-in-preferences-dialog" id="id102" name="id102">Keybinding tab in preferences dialog</a></li> +<li><a class="reference" href="#printing-tab-in-preferences-dialog" id="id103" name="id103">Printing tab in preferences dialog</a></li> +<li><a class="reference" href="#vte-tab-in-preferences-dialog" id="id104" name="id104">VTE tab in preferences dialog</a><ul> +<li><a class="reference" href="#terminal-widget" id="id105" name="id105">Terminal widget</a></li> </ul> </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="id107" name="id107">Open Project</a></li> -<li><a class="reference" href="#close-project" id="id108" name="id108">Close Project</a></li> +<li><a class="reference" href="#project-management" id="id106" name="id106">Project Management</a><ul> +<li><a class="reference" href="#new-project" id="id107" name="id107">New Project</a></li> +<li><a class="reference" href="#project-properties" id="id108" name="id108">Project Properties</a><ul> +<li><a class="reference" href="#make-in-base-path" id="id109" name="id109">Make in base path</a></li> +<li><a class="reference" href="#run-command" id="id110" name="id110">Run command</a></li> </ul> </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> +<li><a class="reference" href="#open-project" id="id111" name="id111">Open Project</a></li> +<li><a class="reference" href="#close-project" id="id112" name="id112">Close Project</a></li> </ul> </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> +<li><a class="reference" href="#build-system" id="id113" name="id113">Build system</a><ul> +<li><a class="reference" href="#compile" id="id114" name="id114">Compile</a></li> +<li><a class="reference" href="#build" id="id115" name="id115">Build</a></li> +<li><a class="reference" href="#make-all" id="id116" name="id116">Make all</a></li> +<li><a class="reference" href="#make-custom-target" id="id117" name="id117">Make custom target</a></li> +<li><a class="reference" href="#make-object" id="id118" name="id118">Make object</a></li> +<li><a class="reference" href="#execute" id="id119" name="id119">Execute</a></li> +<li><a class="reference" href="#stopping-running-processes" id="id120" name="id120">Stopping running processes</a><ul> +<li><a class="reference" href="#terminal-emulators" id="id121" name="id121">Terminal emulators</a></li> </ul> </li> -<li><a class="reference" href="#indicators" id="id120" name="id120">Indicators</a></li> +<li><a class="reference" href="#set-includes-and-arguments" id="id122" name="id122">Set Includes and Arguments</a><ul> +<li><a class="reference" href="#one-step-compilation" id="id123" name="id123">One step compilation</a></li> </ul> </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> +<li><a class="reference" href="#indicators" id="id124" name="id124">Indicators</a></li> </ul> </li> +<li><a class="reference" href="#printing-support" id="id125" name="id125">Printing support</a></li> +<li><a class="reference" href="#plugins" id="id126" name="id126">Plugins</a></li> +<li><a class="reference" href="#keybindings" id="id127" name="id127">Keybindings</a><ul> +<li><a class="reference" href="#switching-documents" id="id128" name="id128">Switching documents</a></li> +<li><a class="reference" href="#configurable-keybindings" id="id129" name="id129">Configurable keybindings</a></li> </ul> </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="id134" name="id134">Special file filetypes.common</a></li> +<li><a class="reference" href="#configuration-files" id="id130" name="id130">Configuration files</a><ul> +<li><a class="reference" href="#global-configuration-file" id="id131" name="id131">Global configuration file</a></li> +<li><a class="reference" href="#filetype-definition-files" id="id132" name="id132">Filetype definition files</a><ul> +<li><a class="reference" href="#format" id="id133" name="id133">Format</a><ul> +<li><a class="reference" href="#styling-section" id="id134" name="id134">[styling] Section</a></li> +<li><a class="reference" href="#keywords-section" id="id135" name="id135">[keywords] Section</a></li> +<li><a class="reference" href="#settings-section" id="id136" name="id136">[settings] Section</a></li> +<li><a class="reference" href="#build-settings-section" id="id137" name="id137">[build_settings] Section</a></li> </ul> </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> +<li><a class="reference" href="#special-file-filetypes-common" id="id138" name="id138">Special file filetypes.common</a></li> </ul> </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> +<li><a class="reference" href="#filetype-extensions" id="id139" name="id139">Filetype extensions</a></li> +<li><a class="reference" href="#templates" id="id140" name="id140">Templates</a><ul> +<li><a class="reference" href="#template-metadata" id="id141" name="id141">Template metadata</a></li> +<li><a class="reference" href="#file-templates" id="id142" name="id142">File templates</a><ul> +<li><a class="reference" href="#custom-file-templates" id="id143" name="id143">Custom file templates</a></li> +<li><a class="reference" href="#filetype-templates" id="id144" name="id144">Filetype templates</a></li> </ul> </li> +<li><a class="reference" href="#customizing-templates" id="id145" name="id145">Customizing templates</a><ul> +<li><a class="reference" href="#template-wildcards" id="id146" name="id146">Template wildcards</a></li> </ul> </li> </ul> </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="#tips-and-tricks" id="id146" name="id146">Tips and tricks</a><ul> -<li><a class="reference" href="#document-notebook" id="id147" name="id147">Document notebook</a></li> -<li><a class="reference" href="#symbols" id="id148" name="id148">Symbols</a></li> -<li><a class="reference" href="#gtk-related" id="id149" name="id149">GTK-related</a></li> +<li><a class="reference" href="#contributing-to-this-document" id="id147" name="id147">Contributing to this document</a></li> +<li><a class="reference" href="#scintilla-keyboard-commands" id="id148" name="id148">Scintilla keyboard commands</a><ul> +<li><a class="reference" href="#keyboard-commands" id="id149" name="id149">Keyboard commands</a></li> </ul> </li> -<li><a class="reference" href="#hidden-preferences" id="id150" name="id150">Hidden preferences</a></li> -<li><a class="reference" href="#compile-time-options" id="id151" name="id151">Compile-time options</a><ul> -<li><a class="reference" href="#src-geany-h" id="id152" name="id152">src/geany.h</a></li> -<li><a class="reference" href="#project-h" id="id153" name="id153">project.h</a></li> -<li><a class="reference" href="#editor-h" id="id154" name="id154">editor.h</a></li> -<li><a class="reference" href="#keyfile-c" id="id155" name="id155">keyfile.c</a></li> +<li><a class="reference" href="#tips-and-tricks" id="id150" name="id150">Tips and tricks</a><ul> +<li><a class="reference" href="#document-notebook" id="id151" name="id151">Document notebook</a></li> +<li><a class="reference" href="#symbols" id="id152" name="id152">Symbols</a></li> +<li><a class="reference" href="#gtk-related" id="id153" name="id153">GTK-related</a></li> </ul> </li> -<li><a class="reference" href="#gnu-general-public-license" id="id156" name="id156">GNU General Public License</a></li> -<li><a class="reference" href="#license-for-scintilla-and-scite" id="id157" name="id157">License for Scintilla and SciTE</a></li> +<li><a class="reference" href="#hidden-preferences" id="id154" name="id154">Hidden preferences</a></li> +<li><a class="reference" href="#compile-time-options" id="id155" name="id155">Compile-time options</a><ul> +<li><a class="reference" href="#src-geany-h" id="id156" name="id156">src/geany.h</a></li> +<li><a class="reference" href="#project-h" id="id157" name="id157">project.h</a></li> +<li><a class="reference" href="#editor-h" id="id158" name="id158">editor.h</a></li> +<li><a class="reference" href="#keyfile-c" id="id159" name="id159">keyfile.c</a></li> </ul> +</li> +<li><a class="reference" href="#gnu-general-public-license" id="id160" name="id160">GNU General Public License</a></li> +<li><a class="reference" href="#license-for-scintilla-and-scite" id="id161" name="id161">License for Scintilla and SciTE</a></li> +</ul> </div> <div class="section"> <h1><a class="toc-backref" href="#id9" id="introduction" name="introduction">Introduction</a></h1> @@ -431,51 +437,75 @@ <h1><a class="toc-backref" href="#id14" id="installation" name="installation">Installation</a></h1> <div class="section"> <h2><a class="toc-backref" href="#id15" id="requirements" name="requirements">Requirements</a></h2> +<p>You will need the GTK (>= 2.6.0) libraries and their dependencies +(Pango, GLib and ATK). Your distro should provide packages for these, +usually installed by default. For Windows, you can download an installer +which bundles these libraries from the website.</p> +</div> +<div class="section"> +<h2><a class="toc-backref" href="#id16" 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 class="section"> +<h2><a class="toc-backref" href="#id17" id="source-compilation" name="source-compilation">Source compilation</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 +libraries and header files. You will also need the Pango, GLib and ATK libraries and header files. All these files are available at -<a class="reference" href="http://www.gtk.org">http://www.gtk.org</a>.</p> +<a class="reference" href="http://www.gtk.org">http://www.gtk.org</a>, but very often your distro will provide development +packages to save the trouble of building these yourself.</p> <p>Furthermore you need, of course, a C compiler and the Make tool; a -C++ compiler is also required for the included Scintilla library. The +C++ compiler is also required (for the included Scintilla library). The GNU versions of these tools are recommended.</p> -</div> -<div class="section"> -<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 -% make +$ ./configure +$ make +</pre> +<p>Then as root:</p> +<pre class="literal-block"> % make install </pre> +<div class="section"> +<h3><a class="toc-backref" href="#id18" id="custom-installation" name="custom-installation">Custom installation</a></h3> <p>The configure script supports several common options, for a detailed list, type:</p> <pre class="literal-block"> -% ./configure --help +$ ./configure --help </pre> +<p>You may also want to read the INSTALL file for advanced installation +options.</p> <p>There also some compile time options which can be found in <tt class="docutils literal"><span class="pre">src/geany.h</span></tt>. Please see <a class="reference" href="#compile-time-options">Compile-time options</a> for more information.</p> +</div> +<div class="section"> +<h3><a class="toc-backref" href="#id19" id="dynamic-linking-loader-support" name="dynamic-linking-loader-support">Dynamic linking loader support</a></h3> <p>In the case that your system lacks dynamic linking loader support, you probably want to pass the option <tt class="docutils literal"><span class="pre">--disable-vte</span></tt> to the <tt class="docutils literal"><span class="pre">configure</span></tt> script. This prevents compiling Geany with dynamic linking loader support to automatically load <tt class="docutils literal"><span class="pre">libvte.so.4</span></tt> if available.</p> +</div> +<div class="section"> +<h3><a class="toc-backref" href="#id20" id="supported-systems" name="supported-systems">Supported systems</a></h3> <p>Geany has been successfully compiled and tested under Debian 3.1 Sarge, Debian 4.0 Etch, Fedora Core 3/4/5, LinuxFromScratch and -FreeBSD 6.0. It also compiles under Microsoft Windows™.</p> -<p>If there are any errors during compilation, check your build -environment and try to find the error, otherwise contact the author -at <enrico(dot)troeger(at)uvena(dot)de>.</p> +FreeBSD 6.0. It also compiles under Microsoft Windows™ (using the +Windows makefiles - see the website for details).</p> </div> <div class="section"> -<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> +<h3><a class="toc-backref" href="#id21" id="build-problems" name="build-problems">Build problems</a></h3> +<p>If there are any errors during compilation, check your build +environment and try to find the error, otherwise contact the mailing +list or the author - <enrico(dot)troeger(at)uvena(dot)de>. Sometimes +you might need to ask for specific help from your distro.</p> </div> </div> +</div> <div class="section"> -<h1><a class="toc-backref" href="#id18" id="usage" name="usage">Usage</a></h1> +<h1><a class="toc-backref" href="#id22" id="usage" name="usage">Usage</a></h1> <div class="section"> -<h2><a class="toc-backref" href="#id19" id="getting-started" name="getting-started">Getting started</a></h2> +<h2><a class="toc-backref" href="#id23" 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> @@ -492,7 +522,7 @@ </ul> </div> <div class="section"> -<h2><a class="toc-backref" href="#id20" id="command-line-options" name="command-line-options">Command line options</a></h2> +<h2><a class="toc-backref" href="#id24" id="command-line-options" name="command-line-options">Command line options</a></h2> <table border="1" class="docutils"> <colgroup> <col width="13%" /> @@ -621,9 +651,9 @@ help screen.</p> </div> <div class="section"> -<h2><a class="toc-backref" href="#id21" id="general" name="general">General</a></h2> +<h2><a class="toc-backref" href="#id25" id="general" name="general">General</a></h2> <div class="section"> -<h3><a class="toc-backref" href="#id22" id="startup" name="startup">Startup</a></h3> +<h3><a class="toc-backref" href="#id26" 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 @@ -638,7 +668,7 @@ files in a running instance using the appropriate command line option.</p> </div> <div class="section"> -<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> +<h3><a class="toc-backref" href="#id27" 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 @@ -647,7 +677,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="#id24" 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="#id28" 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> @@ -691,7 +721,7 @@ ./configure.</p> </div> <div class="section"> -<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> +<h3><a class="toc-backref" href="#id29" 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 @@ -730,9 +760,9 @@ </div> </div> <div class="section"> -<h2><a class="toc-backref" href="#id26" id="documents" name="documents">Documents</a></h2> +<h2><a class="toc-backref" href="#id30" id="documents" name="documents">Documents</a></h2> <div class="section"> -<h3><a class="toc-backref" href="#id27" id="switching-between-documents" name="switching-between-documents">Switching between documents</a></h3> +<h3><a class="toc-backref" href="#id31" 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 @@ -741,9 +771,9 @@ </div> </div> <div class="section"> -<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> +<h2><a class="toc-backref" href="#id32" 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="#id29" id="using-character-sets" name="using-character-sets">Using character sets</a></h3> +<h3><a class="toc-backref" href="#id33" 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, @@ -789,7 +819,7 @@ </ul> </div> <div class="section"> -<h3><a class="toc-backref" href="#id30" id="in-file-encoding-specification" name="in-file-encoding-specification">In-file encoding specification</a></h3> +<h3><a class="toc-backref" href="#id34" 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"> @@ -831,7 +861,7 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id31" id="special-encoding-none" name="special-encoding-none">Special encoding "None"</a></h3> +<h3><a class="toc-backref" href="#id35" 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 @@ -841,7 +871,7 @@ without any character conversion.</p> </div> <div class="section"> -<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> +<h3><a class="toc-backref" href="#id36" 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 @@ -862,9 +892,9 @@ </div> </div> <div class="section"> -<h2><a class="toc-backref" href="#id33" id="editing" name="editing">Editing</a></h2> +<h2><a class="toc-backref" href="#id37" id="editing" name="editing">Editing</a></h2> <div class="section"> -<h3><a class="toc-backref" href="#id34" id="folding" name="folding">Folding</a></h3> +<h3><a class="toc-backref" href="#id38" 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 @@ -888,7 +918,7 @@ it for this click and vice versa.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id35" id="column-mode-editing" name="column-mode-editing">Column mode editing</a></h3> +<h3><a class="toc-backref" href="#id39" 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 @@ -898,7 +928,7 @@ selection.</p> </div> <div class="section"> -<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> +<h3><a class="toc-backref" href="#id40" 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 @@ -906,7 +936,7 @@ before the selected text was copied to the new position.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id37" id="indentation" name="indentation">Indentation</a></h3> +<h3><a class="toc-backref" href="#id41" 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 @@ -924,7 +954,7 @@ </dl> </div> <div class="section"> -<h3><a class="toc-backref" href="#id38" id="auto-indentation" name="auto-indentation">Auto-indentation</a></h3> +<h3><a class="toc-backref" href="#id42" 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> @@ -945,7 +975,7 @@ </dl> </div> <div class="section"> -<h3><a class="toc-backref" href="#id39" id="bookmarks" name="bookmarks">Bookmarks</a></h3> +<h3><a class="toc-backref" href="#id43" 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> @@ -963,7 +993,7 @@ navigate around multiple files.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id40" id="code-navigation-history" name="code-navigation-history">Code Navigation History</a></h3> +<h3><a class="toc-backref" href="#id44" 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> @@ -982,7 +1012,7 @@ and between different files.</p> </div> <div class="section"> -<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> +<h3><a class="toc-backref" href="#id45" 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 @@ -999,7 +1029,7 @@ entry and press OK. It will be deleted automatically.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id42" id="context-actions" name="context-actions">Context actions</a></h3> +<h3><a class="toc-backref" href="#id46" 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 @@ -1025,7 +1055,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="#id43" id="user-definable-snippets" name="user-definable-snippets">User-definable snippets</a></h3> +<h3><a class="toc-backref" href="#id47" 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. @@ -1121,7 +1151,7 @@ needs.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id44" id="inserting-unicode-characters" name="inserting-unicode-characters">Inserting unicode characters</a></h3> +<h3><a class="toc-backref" href="#id48" 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 @@ -1137,7 +1167,7 @@ </div> </div> <div class="section"> -<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> +<h2><a class="toc-backref" href="#id49" 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"> @@ -1152,11 +1182,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="#id46" id="find" name="find">Find</a></h3> +<h3><a class="toc-backref" href="#id50" 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="#id47" id="matching-options" name="matching-options">Matching options</a></h4> +<h4><a class="toc-backref" href="#id51" 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 @@ -1165,7 +1195,7 @@ (Unicode chararacters).</p> </div> <div class="section"> -<h4><a class="toc-backref" href="#id48" id="find-all" name="find-all">Find all</a></h4> +<h4><a class="toc-backref" href="#id52" 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"> @@ -1182,7 +1212,7 @@ removed by selecting the Remove Markers command from the Document menu.</p> </div> <div class="section"> -<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> +<h4><a class="toc-backref" href="#id53" 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 @@ -1204,7 +1234,7 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id50" id="find-usage" name="find-usage">Find usage</a></h3> +<h3><a class="toc-backref" href="#id54" 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 @@ -1214,7 +1244,7 @@ shown in the Messages tab of the Message Window.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id51" id="find-in-files" name="find-in-files">Find in files</a></h3> +<h3><a class="toc-backref" href="#id55" 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 @@ -1223,7 +1253,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="#id52" 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="#id56" 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> @@ -1235,7 +1265,7 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id53" id="replace" name="replace">Replace</a></h3> +<h3><a class="toc-backref" href="#id57" 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" /> @@ -1245,7 +1275,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="#id54" id="replace-all" name="replace-all">Replace all</a></h4> +<h4><a class="toc-backref" href="#id58" 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"> @@ -1260,7 +1290,7 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id55" id="go-to-tag-definition" name="go-to-tag-definition">Go to tag definition</a></h3> +<h3><a class="toc-backref" href="#id59" 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 @@ -1269,17 +1299,17 @@ menu is used.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id56" id="go-to-tag-declaration" name="go-to-tag-declaration">Go to tag declaration</a></h3> +<h3><a class="toc-backref" href="#id60" 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="#id57" id="go-to-line" name="go-to-line">Go to line</a></h3> +<h3><a class="toc-backref" href="#id61" 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="#id58" id="regular-expressions" name="regular-expressions">Regular expressions</a></h3> +<h3><a class="toc-backref" href="#id62" 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> @@ -1352,14 +1382,14 @@ </tbody> </table> <div class="section"> -<h4><a class="toc-backref" href="#id59" id="partial-posix-compatibility" name="partial-posix-compatibility">Partial POSIX compatibility</a></h4> +<h4><a class="toc-backref" href="#id63" 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="#id60" id="tags" name="tags">Tags</a></h2> +<h2><a class="toc-backref" href="#id64" 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 @@ -1369,7 +1399,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="#id61" id="workspace-tags" name="workspace-tags">Workspace tags</a></h3> +<h3><a class="toc-backref" href="#id65" 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 @@ -1378,7 +1408,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="#id62" id="global-tags" name="global-tags">Global tags</a></h3> +<h3><a class="toc-backref" href="#id66" 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 @@ -1398,7 +1428,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="#id63" id="default-global-tags-files" name="default-global-tags-files">Default global tags files</a></h4> +<h4><a class="toc-backref" href="#id67" 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"> @@ -1410,7 +1440,7 @@ </ul> </div> <div class="section"> -<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> +<h4><a class="toc-backref" href="#id68" 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> @@ -1458,7 +1488,7 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id65" id="ignore-tags" name="ignore-tags">Ignore tags</a></h3> +<h3><a class="toc-backref" href="#id69" 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 @@ -1482,7 +1512,7 @@ </div> </div> <div class="section"> -<h2><a class="toc-backref" href="#id66" id="preferences" name="preferences">Preferences</a></h2> +<h2><a class="toc-backref" href="#id70" 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 @@ -1500,10 +1530,10 @@ comes after the screenshot of that tab.</p> </div> <div class="section"> -<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> +<h3><a class="toc-backref" href="#id71" 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="#id68" id="id1" name="id1">Startup</a></h4> +<h4><a class="toc-backref" href="#id72" 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 @@ -1515,7 +1545,7 @@ </dl> </div> <div class="section"> -<h4><a class="toc-backref" href="#id69" id="shutdown" name="shutdown">Shutdown</a></h4> +<h4><a class="toc-backref" href="#id73" 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 @@ -1525,7 +1555,7 @@ </dl> </div> <div class="section"> -<h4><a class="toc-backref" href="#id70" id="projects" name="projects">Projects</a></h4> +<h4><a class="toc-backref" href="#id74" 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 @@ -1534,7 +1564,7 @@ </dl> </div> <div class="section"> -<h4><a class="toc-backref" href="#id71" id="miscellaneous" name="miscellaneous">Miscellaneous</a></h4> +<h4><a class="toc-backref" href="#id75" 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 @@ -1552,10 +1582,10 @@ </div> </div> <div class="section"> -<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> +<h3><a class="toc-backref" href="#id76" 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="#id73" id="sidebar" name="sidebar">Sidebar</a></h4> +<h4><a class="toc-backref" href="#id77" 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 @@ -1570,7 +1600,7 @@ </dl> </div> <div class="section"> -<h4><a class="toc-backref" href="#id74" id="fonts" name="fonts">Fonts</a></h4> +<h4><a class="toc-backref" href="#id78" id="fonts" name="fonts">Fonts</a></h4> <dl class="docutils"> <dt>Editor</dt> <dd>Change the font used to display documents.</dd> @@ -1581,7 +1611,7 @@ </dl> </div> <div class="section"> -<h4><a class="toc-backref" href="#id75" id="editor-tabs" name="editor-tabs">Editor tabs</a></h4> +<h4><a class="toc-backref" href="#id79" 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 @@ -1595,7 +1625,7 @@ </dl> </div> <div class="section"> -<h4><a class="toc-backref" href="#id76" id="tab-positions" name="tab-positions">Tab positions</a></h4> +<h4><a class="toc-backref" href="#id80" 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, @@ -1609,7 +1639,7 @@ </dl> </div> <div class="section"> -<h4><a class="toc-backref" href="#id77" id="id2" name="id2">Miscellaneous</a></h4> +<h4><a class="toc-backref" href="#id81" 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 @@ -1619,18 +1649,18 @@ </div> </div> <div class="section"> -<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> +<h3><a class="toc-backref" href="#id82" 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="#id79" id="toolbar" name="toolbar">Toolbar</a></h4> +<h4><a class="toc-backref" href="#id83" 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="#id80" id="items" name="items">Items</a></h4> +<h4><a class="toc-backref" href="#id84" 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, @@ -1660,7 +1690,7 @@ </dl> </div> <div class="section"> -<h4><a class="toc-backref" href="#id81" id="appearance" name="appearance">Appearance</a></h4> +<h4><a class="toc-backref" href="#id85" 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 @@ -1671,10 +1701,10 @@ </div> </div> <div class="section"> -<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> +<h3><a class="toc-backref" href="#id86" 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="#id83" id="indentation-group" name="indentation-group">Indentation group</a></h4> +<h4><a class="toc-backref" href="#id87" 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> @@ -1699,7 +1729,7 @@ </dl> </div> <div class="section"> -<h4><a class="toc-backref" href="#id84" id="features" name="features">Features</a></h4> +<h4><a class="toc-backref" href="#id88" 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> @@ -1731,7 +1761,7 @@ </div> </div> <div class="section"> -<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> +<h3><a class="toc-backref" href="#id89" 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 @@ -1767,11 +1797,11 @@ </dl> </div> <div class="section"> -<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> +<h3><a class="toc-backref" href="#id90" 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="#id87" id="display" name="display">Display</a></h4> +<h4><a class="toc-backref" href="#id91" 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 @@ -1785,7 +1815,7 @@ </dl> </div> <div class="section"> -<h4><a class="toc-backref" href="#id88" id="long-line-marker" name="long-line-marker">Long line marker</a></h4> +<h4><a class="toc-backref" href="#id92" 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"> @@ -1811,10 +1841,10 @@ </div> </div> <div class="section"> -<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> +<h3><a class="toc-backref" href="#id93" 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="#id90" id="new-files" name="new-files">New files</a></h4> +<h4><a class="toc-backref" href="#id94" 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> @@ -1831,7 +1861,7 @@ </dl> </div> <div class="section"> -<h4><a class="toc-backref" href="#id91" id="saving-files" name="saving-files">Saving files</a></h4> +<h4><a class="toc-backref" href="#id95" 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"> @@ -1850,7 +1880,7 @@ </dl> </div> <div class="section"> -<h4><a class="toc-backref" href="#id92" id="id3" name="id3">Miscellaneous</a></h4> +<h4><a class="toc-backref" href="#id96" 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> @@ -1861,10 +1891,10 @@ </div> </div> <div class="section"> -<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> +<h3><a class="toc-backref" href="#id97" 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="#id94" id="tool-paths" name="tool-paths">Tool paths</a></h4> +<h4><a class="toc-backref" href="#id98" id="tool-paths" name="tool-paths">Tool paths</a></h4> <dl class="docutils"> <dt>Make</dt> <dd>The location of the make executable.</dd> @@ -1884,7 +1914,7 @@ </div> </div> <div class="section"> -<h4><a class="toc-backref" href="#id95" id="commands" name="commands">Commands</a></h4> +<h4><a class="toc-backref" href="#id99" 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. @@ -1894,7 +1924,7 @@ </div> </div> <div class="section"> -<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> +<h3><a class="toc-backref" href="#id100" 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> @@ -1904,7 +1934,7 @@ </div> <img alt="./images/pref_dialog_templ.png" src="./images/pref_dialog_templ.png" /> <div class="section"> -<h4><a class="toc-backref" href="#id97" id="template-data" name="template-data">Template data</a></h4> +<h4><a class="toc-backref" href="#id101" 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> @@ -1937,7 +1967,7 @@ </div> </div> <div class="section"> -<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> +<h3><a class="toc-backref" href="#id102" 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> @@ -1947,7 +1977,7 @@ </div> </div> <div class="section"> -<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> +<h3><a class="toc-backref" href="#id103" 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> @@ -1969,11 +1999,11 @@ </dl> </div> <div class="section"> -<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> +<h3><a class="toc-backref" href="#id104" 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="#id101" id="terminal-widget" name="terminal-widget">Terminal widget</a></h4> +<h4><a class="toc-backref" href="#id105" 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> @@ -2014,7 +2044,7 @@ </div> </div> <div class="section"> -<h2><a class="toc-backref" href="#id102" id="project-management" name="project-management">Project Management</a></h2> +<h2><a class="toc-backref" href="#id106" 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> @@ -2032,7 +2062,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="#id103" id="new-project" name="new-project">New Project</a></h3> +<h3><a class="toc-backref" href="#id107" 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 @@ -2042,7 +2072,7 @@ structure contained in it.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id104" id="project-properties" name="project-properties">Project Properties</a></h3> +<h3><a class="toc-backref" href="#id108" 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 @@ -2051,13 +2081,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="#id105" id="make-in-base-path" name="make-in-base-path">Make in base path</a></h4> +<h4><a class="toc-backref" href="#id109" 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="#id106" id="run-command" name="run-command">Run command</a></h4> +<h4><a class="toc-backref" href="#id110" 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> @@ -2070,7 +2100,7 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id107" id="open-project" name="open-project">Open Project</a></h3> +<h3><a class="toc-backref" href="#id111" 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> @@ -2078,14 +2108,14 @@ open files and open the session files associated with the project.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id108" id="close-project" name="close-project">Close Project</a></h3> +<h3><a class="toc-backref" href="#id112" 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="#id109" id="build-system" name="build-system">Build system</a></h2> +<h2><a class="toc-backref" href="#id113" 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 @@ -2109,7 +2139,7 @@ <li>Set Includes and Arguments</li> </ul> <div class="section"> -<h3><a class="toc-backref" href="#id110" id="compile" name="compile">Compile</a></h3> +<h3><a class="toc-backref" href="#id114" 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> @@ -2119,7 +2149,7 @@ will run the file in its language interpreter.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id111" id="build" name="build">Build</a></h3> +<h3><a class="toc-backref" href="#id115" 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 @@ -2127,7 +2157,7 @@ <p>Interpreted languages do not use the Build command.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id112" id="make-all" name="make-all">Make all</a></h3> +<h3><a class="toc-backref" href="#id116" 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"> @@ -2137,19 +2167,19 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id113" id="make-custom-target" name="make-custom-target">Make custom target</a></h3> +<h3><a class="toc-backref" href="#id117" 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="#id114" id="make-object" name="make-object">Make object</a></h3> +<h3><a class="toc-backref" href="#id118" 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="#id115" id="execute" name="execute">Execute</a></h3> +<h3><a class="toc-backref" href="#id119" 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 - @@ -2160,7 +2190,7 @@ output from the program before the terminal window is closed.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id116" id="stopping-running-processes" name="stopping-running-processes">Stopping running processes</a></h3> +<h3><a class="toc-backref" href="#id120" 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)) @@ -2169,7 +2199,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="#id117" id="terminal-emulators" name="terminal-emulators">Terminal emulators</a></h4> +<h4><a class="toc-backref" href="#id121" 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 @@ -2178,7 +2208,7 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id118" id="set-includes-and-arguments" name="set-includes-and-arguments">Set Includes and Arguments</a></h3> +<h3><a class="toc-backref" href="#id122" 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 @@ -2195,14 +2225,14 @@ different settings, then writing a Makefile and using the Make commands is recommended.</p> <div class="section"> -<h4><a class="toc-backref" href="#id119" id="one-step-compilation" name="one-step-compilation">One step compilation</a></h4> +<h4><a class="toc-backref" href="#id123" 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="#id120" id="indicators" name="indicators">Indicators</a></h3> +<h3><a class="toc-backref" href="#id124" 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, @@ -2212,7 +2242,7 @@ </div> </div> <div class="section"> -<h2><a class="toc-backref" href="#id121" id="printing-support" name="printing-support">Printing support</a></h2> +<h2><a class="toc-backref" href="#id125" 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 @@ -2260,7 +2290,7 @@ gtklp or similar programs can be used.</p> </div> <div class="section"> -<h2><a class="toc-backref" href="#id122" id="plugins" name="plugins">Plugins</a></h2> +<h2><a class="toc-backref" href="#id126" 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 @@ -2280,13 +2310,13 @@ provides some.</p> </div> <div class="section"> -<h2><a class="toc-backref" href="#id123" id="keybindings" name="keybindings">Keybindings</a></h2> +<h2><a class="toc-backref" href="#id127" 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="#id124" id="switching-documents" name="switching-documents">Switching documents</a></h3> +<h3><a class="toc-backref" href="#id128" 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"> @@ -2316,7 +2346,7 @@ </table> </div> <div class="section"> -<h3><a class="toc-backref" href="#id125" id="configurable-keybindings" name="configurable-keybindings">Configurable keybindings</a></h3> +<h3><a class="toc-backref" href="#id129" 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 @@ -2864,9 +2894,9 @@ </div> </div> <div class="section"> -<h1><a class="toc-backref" href="#id126" id="configuration-files" name="configuration-files">Configuration files</a></h1> +<h1><a class="toc-backref" href="#id130" id="configuration-files" name="configuration-files">Configuration files</a></h1> <div class="section"> -<h2><a class="toc-backref" href="#id127" id="global-configuration-file" name="global-configuration-file">Global configuration file</a></h2> +<h2><a class="toc-backref" href="#id131" 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 @@ -2886,7 +2916,7 @@ </div> </div> <div class="section"> -<h2><a class="toc-backref" href="#id128" id="filetype-definition-files" name="filetype-definition-files">Filetype definition files</a></h2> +<h2><a class="toc-backref" href="#id132" 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 @@ -2914,9 +2944,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="#id129" id="format" name="format">Format</a></h3> +<h3><a class="toc-backref" href="#id133" id="format" name="format">Format</a></h3> <div class="section"> -<h4><a class="toc-backref" href="#id130" id="styling-section" name="styling-section">[styling] Section</a></h4> +<h4><a class="toc-backref" href="#id134" 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 @@ -2926,7 +2956,7 @@ value is something other than "true" or "false", "false" is assumed.</p> </div> <div class="section"> -<h4><a class="toc-backref" href="#id131" id="keywords-section" name="keywords-section">[keywords] Section</a></h4> +<h4><a class="toc-backref" href="#id135" 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 @@ -2937,7 +2967,7 @@ </div> </div> <div class="section"> -<h4><a class="toc-backref" href="#id132" id="settings-section" name="settings-section">[settings] Section</a></h4> +<h4><a class="toc-backref" href="#id136" 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 @@ -2998,7 +3028,7 @@ </dl> </div> <div class="section"> -<h4><a class="toc-backref" href="#id133" id="build-settings-section" name="build-settings-section">[build_settings] Section</a></h4> +<h4><a class="toc-backref" href="#id137" 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 @@ -3031,7 +3061,7 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id134" id="special-file-filetypes-common" name="special-file-filetypes-common">Special file filetypes.common</a></h3> +<h3><a class="toc-backref" href="#id138" 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> @@ -3197,7 +3227,7 @@ </div> </div> <div class="section"> -<h2><a class="toc-backref" href="#id135" id="filetype-extensions" name="filetype-extensions">Filetype extensions</a></h2> +<h2><a class="toc-backref" href="#id139" 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 @@ -3223,7 +3253,7 @@ </pre> </div> <div class="section"> -<h2><a class="toc-backref" href="#id136" id="templates" name="templates">Templates</a></h2> +<h2><a class="toc-backref" href="#id140" id="templates" name="templates">Templates</a></h2> <p>Geany supports the following templates:</p> <ul class="simple"> <li>ChangeLog entry</li> @@ -3246,7 +3276,7 @@ function description won't contain the correct function name but "unknown" instead.</p> <div class="section"> -<h3><a class="toc-backref" href="#id137" id="template-metadata" name="template-metadata">Template metadata</a></h3> +<h3><a class="toc-backref" href="#id141" 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 @@ -3256,7 +3286,7 @@ at startup.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id138" id="file-templates" name="file-templates">File templates</a></h3> +<h3><a class="toc-backref" href="#id142" 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> @@ -3268,7 +3298,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="#id139" id="custom-file-templates" name="custom-file-templates">Custom file templates</a></h4> +<h4><a class="toc-backref" href="#id143" 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 @@ -3279,7 +3309,7 @@ template.</p> </div> <div class="section"> -<h4><a class="toc-backref" href="#id140" id="filetype-templates" name="filetype-templates">Filetype templates</a></h4> +<h4><a class="toc-backref" href="#id144" 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 @@ -3291,7 +3321,7 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id141" id="customizing-templates" name="customizing-templates">Customizing templates</a></h3> +<h3><a class="toc-backref" href="#id145" 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 @@ -3299,7 +3329,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="#id142" id="template-wildcards" name="template-wildcards">Template wildcards</a></h4> +<h4><a class="toc-backref" href="#id146" 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> @@ -3418,7 +3448,7 @@ </div> </div> <div class="section"> -<h1><a class="toc-backref" href="#id143" id="contributing-to-this-document" name="contributing-to-this-document">Contributing to this document</a></h1> +<h1><a class="toc-backref" href="#id147" 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 @@ -3438,7 +3468,7 @@ and Fedora systems.</p> </div> <div class="section"> -<h1><a class="toc-backref" href="#id144" id="scintilla-keyboard-commands" name="scintilla-keyboard-commands">Scintilla keyboard commands</a></h1> +<h1><a class="toc-backref" href="#id148" 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 @@ -3447,7 +3477,7 @@ Scintilla and SciTE</a>.</p> <p>20 June 2006</p> <div class="section"> -<h2><a class="toc-backref" href="#id145" id="keyboard-commands" name="keyboard-commands">Keyboard commands</a></h2> +<h2><a class="toc-backref" href="#id149" 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 @@ -3541,9 +3571,9 @@ </div> </div> <div class="section"> -<h1><a class="toc-backref" href="#id146" id="tips-and-tricks" name="tips-and-tricks">Tips and tricks</a></h1> +<h1><a class="toc-backref" href="#id150" id="tips-and-tricks" name="tips-and-tricks">Tips and tricks</a></h1> <div class="section"> -<h2><a class="toc-backref" href="#id147" id="document-notebook" name="document-notebook">Document notebook</a></h2> +<h2><a class="toc-backref" href="#id151" id="document-notebook" name="document-notebook">Document notebook</a></h2> <ul class="simple"> <li>Double-click on empty space in the notebook tab bar to open a new document.</li> @@ -3553,14 +3583,14 @@ </ul> </div> <div class="section"> -<h2><a class="toc-backref" href="#id148" id="symbols" name="symbols">Symbols</a></h2> +<h2><a class="toc-backref" href="#id152" id="symbols" name="symbols">Symbols</a></h2> <ul class="simple"> <li>Ctrl-click on a word in a document to perform <em>Go to Tag Definition</em>.</li> <li>Double-click on a symbol-list group to expand or compact it.</li> </ul> </div> <div class="section"> -<h2><a class="toc-backref" href="#id149" id="gtk-related" name="gtk-related">GTK-related</a></h2> +<h2><a class="toc-backref" href="#id153" id="gtk-related" name="gtk-related">GTK-related</a></h2> <ul class="simple"> <li>Scrolling the mouse wheel over a notebook tab bar will switch notebook pages.</li> @@ -3575,7 +3605,7 @@ </div> </div> <div class="section"> -<h1><a class="toc-backref" href="#id150" id="hidden-preferences" name="hidden-preferences">Hidden preferences</a></h1> +<h1><a class="toc-backref" href="#id154" id="hidden-preferences" name="hidden-preferences">Hidden preferences</a></h1> <p>There are some uncommon preferences that are not shown in the Preferences dialog. These can be set by editing <tt class="docutils literal"><span class="pre">~/.geany/geany.conf</span></tt>, then restarting Geany. Search for the key name, then edit the value. Example:</p> @@ -3647,7 +3677,7 @@ </table> </div> <div class="section"> -<h1><a class="toc-backref" href="#id151" id="compile-time-options" name="compile-time-options">Compile-time options</a></h1> @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

15 years, 3 months

SF.net SVN: geany:[2911] trunk

by ntrel＠users.sourceforge.net

Revision: 2911 http://geany.svn.sourceforge.net/geany/?rev=2911&view=rev Author: ntrel Date: 2008-08-28 16:59:20 +0000 (Thu, 28 Aug 2008) Log Message: ----------- Fix global tags loaded debug message, display total tags count. Add comment to warn about adding tags files vs. downloading separately. Modified Paths: -------------- trunk/ChangeLog trunk/src/symbols.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-08-27 16:41:02 UTC (rev 2910) +++ trunk/ChangeLog 2008-08-28 16:59:20 UTC (rev 2911) @@ -1,3 +1,11 @@ +2008-08-28 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/symbols.c: + Fix global tags loaded debug message, display total tags count. + Add comment to warn about adding tags files vs. downloading + separately. + + 2008-08-27 Nick Treleaven <nick.treleaven<at>btinternet.com> * src/highlighting.c, src/plugindata.h, src/filetypes.c, Modified: trunk/src/symbols.c =================================================================== --- trunk/src/symbols.c 2008-08-27 16:41:02 UTC (rev 2910) +++ trunk/src/symbols.c 2008-08-28 16:59:20 UTC (rev 2911) @@ -65,6 +65,7 @@ const gchar *tag_file; } TagFileInfo; +/* Check before adding any more tags files, usually they should be downloaded separately. */ enum /* Geany tag files */ { GTF_C, @@ -1179,8 +1180,11 @@ gchar *fname; fname = g_strconcat(user_tags_dir, G_DIR_SEPARATOR_S, node->data, NULL); - tm_workspace_load_global_tags(fname, tm_lang); - geany_debug("Loaded %s (%s).", fname, ft->name); + if (tm_workspace_load_global_tags(fname, tm_lang)) + { + geany_debug("Loaded %s (%s), total tags: %u.", fname, ft->name, + tm_get_workspace()->global_tags->len); + } g_free(fname); } g_list_foreach(fnames, (GFunc) g_free, NULL); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

15 years, 3 months

SF.net SVN: geany:[2910] trunk

by ntrel＠users.sourceforge.net

Revision: 2910 http://geany.svn.sourceforge.net/geany/?rev=2910&view=rev Author: ntrel Date: 2008-08-27 16:41:02 +0000 (Wed, 27 Aug 2008) Log Message: ----------- Change hidden pref scroll_stop_at_last_line to TRUE (#2030914). Modified Paths: -------------- trunk/ChangeLog trunk/doc/geany.html trunk/doc/geany.txt trunk/src/keyfile.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-08-27 16:16:50 UTC (rev 2909) +++ trunk/ChangeLog 2008-08-27 16:41:02 UTC (rev 2910) @@ -7,6 +7,8 @@ Wendling, thanks; closes #2060961). * src/filetypes.c, src/filetypes.h: Add GeanyFiletypeGroupID enum and GeanyFiletype::group field. + * src/keyfile.c, doc/geany.txt, doc/geany.html: + Change hidden pref scroll_stop_at_last_line to TRUE (#2030914). 2008-08-26 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/doc/geany.html =================================================================== --- trunk/doc/geany.html 2008-08-27 16:16:50 UTC (rev 2909) +++ trunk/doc/geany.html 2008-08-27 16:41:02 UTC (rev 2910) @@ -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-08-13" /> +<meta name="date" content="2008-08-14" /> <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-08-13</td></tr> +<td>2008-08-14</td></tr> <tr><th class="docinfo-name">Version:</th> <td>0.15</td></tr> </tbody> @@ -3631,7 +3631,7 @@ </tr> <tr><td>scroll_stop_at_last_line</td> <td>Disable scrolling past end of document</td> -<td>false</td> +<td>true</td> </tr> <tr><td><strong>[interface]</strong></td> <td> </td> @@ -4215,7 +4215,7 @@ <div class="footer"> <hr class="footer" /> <a class="reference" href="geany.txt">View document source</a>. -Generated on: 2008-08-14 16:36 UTC. +Generated on: 2008-08-27 16:42 UTC. Generated by <a class="reference" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source. </div> Modified: trunk/doc/geany.txt =================================================================== --- trunk/doc/geany.txt 2008-08-27 16:16:50 UTC (rev 2909) +++ trunk/doc/geany.txt 2008-08-27 16:41:02 UTC (rev 2910) @@ -3230,7 +3230,7 @@ when editing an existing line (i.e. there is some text after the current cursor position on the line). -scroll_stop_at_last_line Disable scrolling past end of document false +scroll_stop_at_last_line Disable scrolling past end of document true **[interface]** show_symbol_list_expanders Whether to show or hide the small expander true icons on the symbol list treeview (only Modified: trunk/src/keyfile.c =================================================================== --- trunk/src/keyfile.c 2008-08-27 16:16:50 UTC (rev 2909) +++ trunk/src/keyfile.c 2008-08-27 16:41:02 UTC (rev 2910) @@ -647,7 +647,7 @@ editor_prefs.newline_strip = utils_get_setting_boolean(config, PACKAGE, "pref_editor_newline_strip", FALSE); editor_prefs.use_gtk_word_boundaries = utils_get_setting_boolean(config, PACKAGE, "use_gtk_word_boundaries", TRUE); editor_prefs.complete_snippets_whilst_editing = utils_get_setting_boolean(config, PACKAGE, "complete_snippets_whilst_editing", FALSE); - editor_prefs.scroll_stop_at_last_line = utils_get_setting_boolean(config, PACKAGE, "scroll_stop_at_last_line", FALSE); + editor_prefs.scroll_stop_at_last_line = utils_get_setting_boolean(config, PACKAGE, "scroll_stop_at_last_line", TRUE); editor_prefs.line_break_column = utils_get_setting_integer(config, PACKAGE, "line_break_column", 72); editor_prefs.auto_continue_multiline = utils_get_setting_boolean(config, PACKAGE, "auto_continue_multiline", TRUE); editor_prefs.comment_toggle_mark = utils_get_setting_string(config, PACKAGE, "comment_toggle_mark", GEANY_TOGGLE_MARK); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

15 years, 3 months

SF.net SVN: geany:[2909] trunk

by ntrel＠users.sourceforge.net

Revision: 2909 http://geany.svn.sourceforge.net/geany/?rev=2909&view=rev Author: ntrel Date: 2008-08-27 16:16:50 +0000 (Wed, 27 Aug 2008) Log Message: ----------- Add GeanyFiletypeGroupID enum and GeanyFiletype::group field. Modified Paths: -------------- trunk/ChangeLog trunk/src/filetypes.c trunk/src/filetypes.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-08-27 12:44:54 UTC (rev 2908) +++ trunk/ChangeLog 2008-08-27 16:16:50 UTC (rev 2909) @@ -1,10 +1,12 @@ 2008-08-27 Nick Treleaven <nick.treleaven<at>btinternet.com> - * src/highlighting.c, src/plugindata.h, src/filetypes.c, - src/filetypes.h, src/symbols.c, THANKS, tagmanager/parsers.h, + * src/highlighting.c, src/plugindata.h, src/filetypes.c, + src/filetypes.h, src/symbols.c, THANKS, tagmanager/parsers.h, tagmanager/c.c, data/filetypes.glsl, data/filetype_extensions.conf: - Add OpenGL Shader Language (GLSL) filetype (patch from Colomban + Add OpenGL Shader Language (GLSL) filetype (patch from Colomban Wendling, thanks; closes #2060961). + * src/filetypes.c, src/filetypes.h: + Add GeanyFiletypeGroupID enum and GeanyFiletype::group field. 2008-08-26 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/src/filetypes.c =================================================================== --- trunk/src/filetypes.c 2008-08-27 12:44:54 UTC (rev 2908) +++ trunk/src/filetypes.c 2008-08-27 16:16:50 UTC (rev 2909) @@ -74,6 +74,7 @@ ft->pattern = utils_strv_new("*.c", "*.h", NULL); ft->comment_open = g_strdup("/*"); ft->comment_close = g_strdup("*/"); + ft->group = GEANY_FILETYPE_GROUP_COMPILED; #define CPP ft = filetypes[GEANY_FILETYPES_CPP]; @@ -85,6 +86,7 @@ "*.h", "*.hpp", "*.hxx", "*.h++", "*.hh", "*.C", NULL); ft->comment_open = g_strdup("//"); ft->comment_close = NULL; + ft->group = GEANY_FILETYPE_GROUP_COMPILED; #define CS ft = filetypes[GEANY_FILETYPES_CS]; @@ -95,6 +97,7 @@ ft->pattern = utils_strv_new("*.cs", "*.vala", NULL); ft->comment_open = g_strdup("//"); ft->comment_close = NULL; + ft->group = GEANY_FILETYPE_GROUP_COMPILED; #define D ft = filetypes[GEANY_FILETYPES_D]; @@ -105,6 +108,7 @@ ft->pattern = utils_strv_new("*.d", "*.di", NULL); ft->comment_open = g_strdup("//"); ft->comment_close = NULL; + ft->group = GEANY_FILETYPE_GROUP_COMPILED; #define JAVA ft = filetypes[GEANY_FILETYPES_JAVA]; @@ -115,6 +119,7 @@ ft->pattern = utils_strv_new("*.java", "*.jsp", NULL); ft->comment_open = g_strdup("/*"); ft->comment_close = g_strdup("*/"); + ft->group = GEANY_FILETYPE_GROUP_COMPILED; #define PAS /* to avoid warnings when building under Windows, the symbol PASCAL is there defined */ ft = filetypes[GEANY_FILETYPES_PASCAL]; @@ -126,6 +131,7 @@ "*.dpk", NULL); ft->comment_open = g_strdup("{"); ft->comment_close = g_strdup("}"); + ft->group = GEANY_FILETYPE_GROUP_COMPILED; #define ASM ft = filetypes[GEANY_FILETYPES_ASM]; @@ -136,6 +142,7 @@ ft->pattern = utils_strv_new("*.asm", NULL); ft->comment_open = g_strdup(";"); ft->comment_close = NULL; + ft->group = GEANY_FILETYPE_GROUP_COMPILED; #define BASIC ft = filetypes[GEANY_FILETYPES_BASIC]; @@ -146,6 +153,7 @@ ft->pattern = utils_strv_new("*.bas", "*.bi", NULL); ft->comment_open = g_strdup("'"); ft->comment_close = NULL; + ft->group = GEANY_FILETYPE_GROUP_COMPILED; #define FORTRAN ft = filetypes[GEANY_FILETYPES_FORTRAN]; @@ -156,6 +164,7 @@ ft->pattern = utils_strv_new("*.f90", "*.f95", "*.f03", NULL); ft->comment_open = g_strdup("c"); ft->comment_close = NULL; + ft->group = GEANY_FILETYPE_GROUP_COMPILED; #define F77 ft = filetypes[GEANY_FILETYPES_F77]; @@ -166,6 +175,7 @@ ft->pattern = utils_strv_new("*.f", "*.for", "*.ftn", "*.f77", NULL); ft->comment_open = g_strdup("c"); ft->comment_close = NULL; + ft->group = GEANY_FILETYPE_GROUP_COMPILED; #define GLSL ft = filetypes[GEANY_FILETYPES_GLSL]; @@ -176,6 +186,7 @@ ft->pattern = utils_strv_new("*.glsl", "*.frag", "*.vert", NULL); ft->comment_open = g_strdup("/*"); ft->comment_close = g_strdup("*/"); + ft->group = GEANY_FILETYPE_GROUP_COMPILED; #define CAML ft = filetypes[GEANY_FILETYPES_CAML]; @@ -186,6 +197,7 @@ ft->pattern = utils_strv_new("*.ml", "*.mli", NULL); ft->comment_open = g_strdup("(*"); ft->comment_close = g_strdup("*)"); + ft->group = GEANY_FILETYPE_GROUP_COMPILED; #define PERL ft = filetypes[GEANY_FILETYPES_PERL]; @@ -197,6 +209,7 @@ "*.pod", NULL); ft->comment_open = g_strdup("#"); ft->comment_close = NULL; + ft->group = GEANY_FILETYPE_GROUP_SCRIPT; #define PHP ft = filetypes[GEANY_FILETYPES_PHP]; @@ -208,6 +221,7 @@ "*.phtml", NULL); ft->comment_open = g_strdup("//"); ft->comment_close = NULL; + ft->group = GEANY_FILETYPE_GROUP_SCRIPT; #define JAVASCRIPT ft = filetypes[GEANY_FILETYPES_JS]; @@ -218,6 +232,7 @@ ft->pattern = utils_strv_new("*.js", NULL); ft->comment_open = g_strdup("//"); ft->comment_close = NULL; + ft->group = GEANY_FILETYPE_GROUP_SCRIPT; #define PYTHON ft = filetypes[GEANY_FILETYPES_PYTHON]; @@ -228,6 +243,7 @@ ft->pattern = utils_strv_new("*.py", "*.pyw", NULL); ft->comment_open = g_strdup("#"); ft->comment_close = NULL; + ft->group = GEANY_FILETYPE_GROUP_SCRIPT; #define RUBY ft = filetypes[GEANY_FILETYPES_RUBY]; @@ -238,6 +254,7 @@ ft->pattern = utils_strv_new("*.rb", "*.rhtml", "*.ruby", NULL); ft->comment_open = g_strdup("#"); ft->comment_close = NULL; + ft->group = GEANY_FILETYPE_GROUP_SCRIPT; #define TCL ft = filetypes[GEANY_FILETYPES_TCL]; @@ -248,6 +265,7 @@ ft->pattern = utils_strv_new("*.tcl", "*.tk", "*.wish", NULL); ft->comment_open = g_strdup("#"); ft->comment_close = NULL; + ft->group = GEANY_FILETYPE_GROUP_SCRIPT; #define LUA ft = filetypes[GEANY_FILETYPES_LUA]; @@ -258,6 +276,7 @@ ft->pattern = utils_strv_new("*.lua", NULL); ft->comment_open = g_strdup("--"); ft->comment_close = NULL; + ft->group = GEANY_FILETYPE_GROUP_SCRIPT; #define FERITE ft = filetypes[GEANY_FILETYPES_FERITE]; @@ -268,6 +287,7 @@ ft->pattern = utils_strv_new("*.fe", NULL); ft->comment_open = g_strdup("/*"); ft->comment_close = g_strdup("*/"); + ft->group = GEANY_FILETYPE_GROUP_SCRIPT; #define HASKELL ft = filetypes[GEANY_FILETYPES_HASKELL]; @@ -278,6 +298,7 @@ ft->pattern = utils_strv_new("*.hs", "*.lhs", NULL); ft->comment_open = g_strdup("--"); ft->comment_close = NULL; + ft->group = GEANY_FILETYPE_GROUP_COMPILED; #define SH ft = filetypes[GEANY_FILETYPES_SH]; @@ -289,6 +310,7 @@ "configure.in.in", "configure.ac", "*.ksh", "*.zsh", "*.ash", "*.bash", NULL); ft->comment_open = g_strdup("#"); ft->comment_close = NULL; + ft->group = GEANY_FILETYPE_GROUP_SCRIPT; #define MAKE ft = filetypes[GEANY_FILETYPES_MAKE]; @@ -300,6 +322,7 @@ "*.mak", "*.mk", "GNUmakefile", "makefile", "Makefile", "makefile.*", "Makefile.*", NULL); ft->comment_open = g_strdup("#"); ft->comment_close = NULL; + ft->group = GEANY_FILETYPE_GROUP_SCRIPT; #define XML ft = filetypes[GEANY_FILETYPES_XML]; @@ -311,6 +334,7 @@ "*.xml", "*.sgml", "*.xsl", "*.xslt", "*.xsd", "*.xhtml", NULL); ft->comment_open = g_strdup(""); + ft->group = GEANY_FILETYPE_GROUP_MARKUP; #define DOCBOOK ft = filetypes[GEANY_FILETYPES_DOCBOOK]; @@ -321,6 +345,7 @@ ft->pattern = utils_strv_new("*.docbook", NULL); ft->comment_open = g_strdup(""); + ft->group = GEANY_FILETYPE_GROUP_MARKUP; #define HTML ft = filetypes[GEANY_FILETYPES_HTML]; @@ -332,6 +357,7 @@ "*.htm", "*.html", "*.shtml", "*.hta", "*.htd", "*.htt", "*.cfm", NULL); ft->comment_open = g_strdup(""); + ft->group = GEANY_FILETYPE_GROUP_MARKUP; #define CSS ft = filetypes[GEANY_FILETYPES_CSS]; @@ -342,6 +368,7 @@ ft->pattern = utils_strv_new("*.css", NULL); ft->comment_open = g_strdup("/*"); ft->comment_close = g_strdup("*/"); + ft->group = GEANY_FILETYPE_GROUP_MARKUP; /* not really markup but fit quite well to HTML */ #define SQL ft = filetypes[GEANY_FILETYPES_SQL]; @@ -352,6 +379,7 @@ ft->pattern = utils_strv_new("*.sql", NULL); ft->comment_open = g_strdup("/*"); ft->comment_close = g_strdup("*/"); + ft->group = GEANY_FILETYPE_GROUP_MISC; #define LATEX ft = filetypes[GEANY_FILETYPES_LATEX]; @@ -362,6 +390,7 @@ ft->pattern = utils_strv_new("*.tex", "*.sty", "*.idx", "*.ltx", NULL); ft->comment_open = g_strdup("%"); ft->comment_close = NULL; + ft->group = GEANY_FILETYPE_GROUP_MISC; #define OMS ft = filetypes[GEANY_FILETYPES_OMS]; @@ -372,6 +401,7 @@ ft->pattern = utils_strv_new("*.oms", NULL); ft->comment_open = g_strdup("#"); ft->comment_close = NULL; + ft->group = GEANY_FILETYPE_GROUP_SCRIPT; #define VHDL ft = filetypes[GEANY_FILETYPES_VHDL]; @@ -382,6 +412,7 @@ ft->pattern = utils_strv_new("*.vhd", "*.vhdl", NULL); ft->comment_open = g_strdup("--"); ft->comment_close = NULL; + ft->group = GEANY_FILETYPE_GROUP_COMPILED; #define DIFF ft = filetypes[GEANY_FILETYPES_DIFF]; @@ -392,6 +423,7 @@ ft->pattern = utils_strv_new("*.diff", "*.patch", "*.rej", NULL); ft->comment_open = g_strdup("#"); ft->comment_close = NULL; + ft->group = GEANY_FILETYPE_GROUP_MISC; #define CONF ft = filetypes[GEANY_FILETYPES_CONF]; @@ -403,6 +435,7 @@ "*.cfg", NULL); ft->comment_open = g_strdup("#"); ft->comment_close = NULL; + ft->group = GEANY_FILETYPE_GROUP_MISC; #define HAXE ft = filetypes[GEANY_FILETYPES_HAXE]; @@ -413,6 +446,7 @@ ft->pattern = utils_strv_new("*.hx", NULL); ft->comment_open = g_strdup("//"); ft->comment_close = NULL; + ft->group = GEANY_FILETYPE_GROUP_COMPILED; #define REST ft = filetypes[GEANY_FILETYPES_REST]; @@ -424,6 +458,7 @@ "*.rest", "*.reST", "*.rst", NULL); ft->comment_open = NULL; ft->comment_close = NULL; + ft->group = GEANY_FILETYPE_GROUP_MISC; #define ALL ft = filetypes[GEANY_FILETYPES_NONE]; @@ -434,6 +469,7 @@ ft->pattern = utils_strv_new("*", NULL); ft->comment_open = NULL; ft->comment_close = NULL; + ft->group = GEANY_FILETYPE_GROUP_NONE; } @@ -517,34 +553,29 @@ const gchar *title = ft->title; /* insert separators for different filetype groups */ - switch (ft_id) + switch (ft->group) { - case GEANY_FILETYPES_GROUP_COMPILED: /* programming */ - { + case GEANY_FILETYPE_GROUP_COMPILED: /* programming */ sub_menu = sub_menu_programming; break; - } - case GEANY_FILETYPES_GROUP_SCRIPT: /* scripts */ - { + + case GEANY_FILETYPE_GROUP_SCRIPT: /* scripts */ sub_menu = sub_menu_scripts; break; - } - case GEANY_FILETYPES_GROUP_MARKUP: /* markup */ - { /* (include also CSS, not really markup but fit quite well to HTML) */ + + case GEANY_FILETYPE_GROUP_MARKUP: /* markup */ sub_menu = sub_menu_markup; break; - } - case GEANY_FILETYPES_GROUP_MISC: /* misc */ - { + + case GEANY_FILETYPE_GROUP_MISC: /* misc */ sub_menu = sub_menu_misc; break; - } - case GEANY_FILETYPES_NONE: /* none */ - { + + case GEANY_FILETYPE_GROUP_NONE: /* none */ sub_menu = filetype_menu; title = _("None"); break; - } + default: break; } create_radio_menu_item(sub_menu, title, ft); Modified: trunk/src/filetypes.h =================================================================== --- trunk/src/filetypes.h 2008-08-27 12:44:54 UTC (rev 2908) +++ trunk/src/filetypes.h 2008-08-27 16:16:50 UTC (rev 2909) @@ -30,13 +30,13 @@ /* Each group should be alpha-sorted, based on filetype::name (not enum name). - * Warning: remember to break the plugin ABI when adding items (this enum needs to be changed - * to work with an ABI-stable filetype::group_name field. */ + * Warning: remember to break the plugin ABI when adding items. */ +/* TODO: for a stable ABI put GEANY_FILETYPES_NONE first, and use a sorted duplicate + * filetypes array for GUI elements. */ typedef enum { /* normally compiled languages */ - GEANY_FILETYPES_GROUP_COMPILED = 0, - GEANY_FILETYPES_ASM = GEANY_FILETYPES_GROUP_COMPILED, + GEANY_FILETYPES_ASM = 0, GEANY_FILETYPES_C, GEANY_FILETYPES_CPP, GEANY_FILETYPES_CS, @@ -53,8 +53,7 @@ GEANY_FILETYPES_VHDL, /* script languages */ - GEANY_FILETYPES_GROUP_SCRIPT, - GEANY_FILETYPES_FERITE = GEANY_FILETYPES_GROUP_SCRIPT, + GEANY_FILETYPES_FERITE, GEANY_FILETYPES_JS, GEANY_FILETYPES_LUA, GEANY_FILETYPES_MAKE, @@ -66,16 +65,14 @@ GEANY_FILETYPES_SH, GEANY_FILETYPES_TCL, - /* markup langauges */ - GEANY_FILETYPES_GROUP_MARKUP, - GEANY_FILETYPES_CSS = GEANY_FILETYPES_GROUP_MARKUP, + /* markup langauges */ + GEANY_FILETYPES_CSS, GEANY_FILETYPES_DOCBOOK, GEANY_FILETYPES_HTML, GEANY_FILETYPES_XML, /* miscellaneous languages */ - GEANY_FILETYPES_GROUP_MISC, - GEANY_FILETYPES_CONF = GEANY_FILETYPES_GROUP_MISC, + GEANY_FILETYPES_CONF, GEANY_FILETYPES_DIFF, GEANY_FILETYPES_LATEX, GEANY_FILETYPES_REST, @@ -85,6 +82,17 @@ GEANY_MAX_BUILT_IN_FILETYPES /* Use filetypes_array->len instead */ } filetype_id; +typedef enum +{ + GEANY_FILETYPE_GROUP_NONE, + GEANY_FILETYPE_GROUP_COMPILED, + GEANY_FILETYPE_GROUP_SCRIPT, + GEANY_FILETYPE_GROUP_MARKUP, + GEANY_FILETYPE_GROUP_MISC +} +GeanyFiletypeGroupID; + + /* Safe wrapper to get the id field of a possibly NULL filetype pointer. */ #define FILETYPE_ID(filetype_ptr) \ (((filetype_ptr) != NULL) ? (filetype_ptr)->id : GEANY_FILETYPES_NONE) @@ -123,6 +131,7 @@ gboolean comment_use_indent; struct build_programs *programs; struct build_actions *actions; + GeanyFiletypeGroupID group; }; extern GPtrArray *filetypes_array; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

15 years, 3 months

SF.net SVN: geany:[2908] trunk

by ntrel＠users.sourceforge.net

Revision: 2908 http://geany.svn.sourceforge.net/geany/?rev=2908&view=rev Author: ntrel Date: 2008-08-27 12:44:54 +0000 (Wed, 27 Aug 2008) Log Message: ----------- Add OpenGL Shader Language (GLSL) filetype (patch from Colomban Wendling, thanks; closes #2060961). Modified Paths: -------------- trunk/ChangeLog trunk/THANKS trunk/data/filetype_extensions.conf trunk/src/filetypes.c trunk/src/filetypes.h trunk/src/highlighting.c trunk/src/plugindata.h trunk/src/symbols.c trunk/tagmanager/c.c trunk/tagmanager/parsers.h Added Paths: ----------- trunk/data/filetypes.glsl Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-08-26 16:30:25 UTC (rev 2907) +++ trunk/ChangeLog 2008-08-27 12:44:54 UTC (rev 2908) @@ -1,3 +1,12 @@ +2008-08-27 Nick Treleaven <nick.treleaven<at>btinternet.com> + + * src/highlighting.c, src/plugindata.h, src/filetypes.c, + src/filetypes.h, src/symbols.c, THANKS, tagmanager/parsers.h, + tagmanager/c.c, data/filetypes.glsl, data/filetype_extensions.conf: + Add OpenGL Shader Language (GLSL) filetype (patch from Colomban + Wendling, thanks; closes #2060961). + + 2008-08-26 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * src/highlighting.c: Modified: trunk/THANKS =================================================================== --- trunk/THANKS 2008-08-26 16:30:25 UTC (rev 2907) +++ trunk/THANKS 2008-08-27 12:44:54 UTC (rev 2908) @@ -45,6 +45,7 @@ Matti Mårds <mamaar(at)gmail(dot)com> - create PHP tags script Robert McGinley <mcginleyr1(at)gmail(dot)com> - Documentation improvements Felipe Pena <felipensp(at)gmail(dot)com> - Missing PHP keywords +Colomban Wendling <colombanw(at)users(dot)sourceforge(dot)net> - GLSL filetype patch Translators: ------------ Modified: trunk/data/filetype_extensions.conf =================================================================== --- trunk/data/filetype_extensions.conf 2008-08-26 16:30:25 UTC (rev 2907) +++ trunk/data/filetype_extensions.conf 2008-08-27 12:44:54 UTC (rev 2908) @@ -13,6 +13,7 @@ F77=*.f;*.for;*.ftn;*.f77; Fortran=*.f90;*.f95;*.f03; FreeBasic=*.bas;*.bi; +GLSL=*.glsl;*.frag;*.vert Haskell=*.hs;*.lhs; Haxe=*.hx; Java=*.java;*.jsp; Added: trunk/data/filetypes.glsl =================================================================== --- trunk/data/filetypes.glsl (rev 0) +++ trunk/data/filetypes.glsl 2008-08-27 12:44:54 UTC (rev 2908) @@ -0,0 +1,68 @@ +# For complete documentation of this file, please see Geany's main documentation +[styling] +# foreground;background;bold;italic +default=0x000000;0xffffff;false;false +comment=0xd00000;0xffffff;false;false +commentline=0xd00000;0xffffff;false;false +commentdoc=0x3f5fbf;0xffffff;false;false +number=0x007f00;0xffffff;false;false +word=0x00007f;0xffffff;true;false +word2=0x991111;0xffffff;true;false +string=0xff901e;0xffffff;false;false +character=0xff901e;0xffffff;false;false +uuid=0x404080;0xffffff;false;false +preprocessor=0x007F7F;0xffffff;false;false +operator=0x301010;0xffffff;false;false +identifier=0x000000;0xffffff;false;false +stringeol=0x000000;0xe0c0e0;false;false +verbatim=0x101030;0xffffff;false;false +regex=0x105090;0xffffff;false;false +commentlinedoc=0x3f5fbf;0xffffff;true;false +commentdockeyword=0x3f5fbf;0xffffff;true;true +commentdockeyworderror=0x3f5fbf;0xffffff;false;false +globalclass=0x0000d0;0xffffff;true;false +# whether arguments of preprocessor commands should be styled (only first argument is used) +# 1 to enable, 0 to disable +styling_within_preprocessor=1;0;false;false + +[keywords] +# all items must be in one line +primary=if else switch case default for while do discard return break continue true false struct void bool int uint float vec2 vec3 vec4 ivec2 ivec3 ivec4 bvec2 bvec3 bvec4 uvec2 uvec3 uvec4 mat2 mat3 mat4 mat2x2 mat2x3 mat2x4 mat3x2 mat3x3 mat3x4 mat4x2 mat4x3 mat4x4 sampler1D sampler2D sampler3D samplerCube sampler1DShadow sampler2DShadow sampler1DArray sampler2DArray sampler1DArrayShadow sampler2DArrayShadow isampler1D isampler2D isampler3D isamplerCube isampler1DArray isampler2DArray usampler1D usampler2D usampler3D usamplerCube usampler1DArray usampler2DArray const invariant centroid in out inout attribute uniform varying smooth flat noperspective highp mediump lowp +secondary= +# these are some doxygen keywords (incomplete) +docComment=attention author brief bug class code date def enum example exception file fn namespace note param remarks return returns see since struct throw todo typedef var version warning union + +[settings] +# default extension used when saving files +#extension=glsl + +# 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=// +comment_close= +# this is an alternative way, so multiline comments are used +#comment_open=/* +#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=true + +# 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= +#linker= +#run_cmd= + + Property changes on: trunk/data/filetypes.glsl ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/src/filetypes.c =================================================================== --- trunk/src/filetypes.c 2008-08-26 16:30:25 UTC (rev 2907) +++ trunk/src/filetypes.c 2008-08-27 12:44:54 UTC (rev 2908) @@ -167,6 +167,16 @@ ft->comment_open = g_strdup("c"); ft->comment_close = NULL; +#define GLSL + ft = filetypes[GEANY_FILETYPES_GLSL]; + ft->lang = 31; + ft->name = g_strdup("GLSL"); + ft->title = g_strdup_printf(_("%s source file"), "GLSL"); + ft->extension = g_strdup("glsl"); + ft->pattern = utils_strv_new("*.glsl", "*.frag", "*.vert", NULL); + ft->comment_open = g_strdup("/*"); + ft->comment_close = g_strdup("*/"); + #define CAML ft = filetypes[GEANY_FILETYPES_CAML]; ft->lang = -2; Modified: trunk/src/filetypes.h =================================================================== --- trunk/src/filetypes.h 2008-08-26 16:30:25 UTC (rev 2907) +++ trunk/src/filetypes.h 2008-08-27 12:44:54 UTC (rev 2908) @@ -45,6 +45,7 @@ GEANY_FILETYPES_F77, GEANY_FILETYPES_FORTRAN, GEANY_FILETYPES_BASIC, /* FreeBasic */ + GEANY_FILETYPES_GLSL, GEANY_FILETYPES_HASKELL, GEANY_FILETYPES_HAXE, GEANY_FILETYPES_JAVA, Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2008-08-26 16:30:25 UTC (rev 2907) +++ trunk/src/highlighting.c 2008-08-27 12:44:54 UTC (rev 2908) @@ -793,6 +793,61 @@ } +static void styleset_glsl_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) +{ + new_style_array(GEANY_FILETYPES_GLSL, 21); + styleset_c_like_init(config, config_home, GEANY_FILETYPES_GLSL); + get_keyfile_int(config, config_home, "styling", "styling_within_preprocessor", + 1, 0, &style_sets[GEANY_FILETYPES_GLSL].styling[20]); + + style_sets[GEANY_FILETYPES_GLSL].keywords = g_new(gchar*, 4); + get_keyfile_keywords(config, config_home, "keywords", "primary", GEANY_FILETYPES_GLSL, 0, + "if else switch case default for while do discard return break" + "continue true false struct void bool int uint float vec2 vec3" + "vec4 ivec2 ivec3 ivec4 bvec2 bvec3 bvec4 uvec2 uvec3 uvec4 mat2" + "mat3 mat4 mat2x2 mat2x3 mat2x4 mat3x2 mat3x3 mat3x4 mat4x2 mat4x3" + "mat4x4 sampler1D sampler2D sampler3D samplerCube sampler1DShadow" + "sampler2DShadow sampler1DArray sampler2DArray sampler1DArrayShadow" + "sampler2DArrayShadow isampler1D isampler2D isampler3D isamplerCube" + "isampler1DArray isampler2DArray usampler1D usampler2D usampler3D" + "usamplerCube usampler1DArray usampler2DArray const invariant" + "centroid in out inout attribute uniform varying smooth flat" + "noperspective highp mediump lowp"); + get_keyfile_keywords(config, config_home, "keywords", "secondary", GEANY_FILETYPES_GLSL, 1, ""); + get_keyfile_keywords(config, config_home, "keywords", "docComment", GEANY_FILETYPES_GLSL, 2, "TODO FIXME"); + style_sets[GEANY_FILETYPES_GLSL].keywords[3] = NULL; + + get_keyfile_wordchars(config, config_home, + &style_sets[GEANY_FILETYPES_GLSL].wordchars); +} + + +static void styleset_glsl(ScintillaObject *sci) +{ + const filetype_id ft_id = GEANY_FILETYPES_GLSL; + + styleset_common(sci, 5, ft_id); + + apply_filetype_properties(sci, SCLEX_CPP, ft_id); + + SSM(sci, SCI_SETKEYWORDS, 0, (sptr_t) style_sets[GEANY_FILETYPES_GLSL].keywords[0]); + /* for SCI_SETKEYWORDS = 1, see below*/ + SSM(sci, SCI_SETKEYWORDS, 2, (sptr_t) style_sets[GEANY_FILETYPES_GLSL].keywords[2]); + + /* assign global types, merge them with user defined keywords and set them */ + assign_global_and_user_keywords(sci, style_sets[GEANY_FILETYPES_GLSL].keywords[1], + filetypes[ft_id]->lang); + + styleset_c_like(sci, GEANY_FILETYPES_GLSL); + + if (style_sets[GEANY_FILETYPES_GLSL].styling[20].foreground == 1) + SSM(sci, SCI_SETPROPERTY, (sptr_t) "styling.within.preprocessor", (sptr_t) "1"); + SSM(sci, SCI_SETPROPERTY, (sptr_t) "preprocessor.symbol.$(file.patterns.cpp)", (sptr_t) "#"); + SSM(sci, SCI_SETPROPERTY, (sptr_t) "preprocessor.start.$(file.patterns.cpp)", (sptr_t) "if ifdef ifndef"); + SSM(sci, SCI_SETPROPERTY, (sptr_t) "preprocessor.middle.$(file.patterns.cpp)", (sptr_t) "else elif"); + SSM(sci, SCI_SETPROPERTY, (sptr_t) "preprocessor.end.$(file.patterns.cpp)", (sptr_t) "endif"); +} + static void styleset_cs_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { new_style_array(GEANY_FILETYPES_CS, 21); @@ -2979,6 +3034,7 @@ 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_GLSL, glsl); init_styleset_case(GEANY_FILETYPES_HASKELL, haskell); init_styleset_case(GEANY_FILETYPES_HAXE, haxe); init_styleset_case(GEANY_FILETYPES_HTML, html); @@ -3032,6 +3088,7 @@ styleset_case(GEANY_FILETYPES_FERITE, ferite); styleset_case(GEANY_FILETYPES_F77, f77); styleset_case(GEANY_FILETYPES_FORTRAN, fortran); + styleset_case(GEANY_FILETYPES_GLSL, glsl); styleset_case(GEANY_FILETYPES_HASKELL, haskell); styleset_case(GEANY_FILETYPES_HAXE, haxe); styleset_case(GEANY_FILETYPES_HTML, html); Modified: trunk/src/plugindata.h =================================================================== --- trunk/src/plugindata.h 2008-08-26 16:30:25 UTC (rev 2907) +++ trunk/src/plugindata.h 2008-08-27 12:44:54 UTC (rev 2908) @@ -41,13 +41,13 @@ enum { /** The Application Programming Interface (API) version, incremented * whenever any plugin data types are modified or appended to. */ - GEANY_API_VERSION = 89, + GEANY_API_VERSION = 90, /** The Application Binary Interface (ABI) version, incremented whenever * existing fields in the plugin data types have to be changed or reordered. */ /* This should usually stay the same if fields are only appended, assuming only pointers to * structs and not structs themselves are declared by plugins. */ - GEANY_ABI_VERSION = 44 + GEANY_ABI_VERSION = 45 }; /** Check the plugin can be loaded by Geany. Modified: trunk/src/symbols.c =================================================================== --- trunk/src/symbols.c 2008-08-26 16:30:25 UTC (rev 2907) +++ trunk/src/symbols.c 2008-08-27 12:44:54 UTC (rev 2908) @@ -232,6 +232,7 @@ { case GEANY_FILETYPES_C: /* for C++ .h headers or C structs */ case GEANY_FILETYPES_CPP: + case GEANY_FILETYPES_GLSL: /* for structs */ /*case GEANY_FILETYPES_RUBY:*/ /* not sure what to use atm*/ { static gchar cc[] = "::"; Modified: trunk/tagmanager/c.c =================================================================== --- trunk/tagmanager/c.c 2008-08-26 16:30:25 UTC (rev 2907) +++ trunk/tagmanager/c.c 2008-08-27 12:44:54 UTC (rev 2908) @@ -247,6 +247,7 @@ static langType Lang_csharp; static langType Lang_java; static langType Lang_d; +static langType Lang_glsl; static langType Lang_ferite; /* Used to index into the CKinds table. */ @@ -2772,6 +2773,13 @@ buildKeywordHash (language, 1); /* C++ keywords */ } +static void initializeGLSLParser (const langType language) +{ + contextual_fake_count = 0; + Lang_glsl = language; + buildKeywordHash (language, 0); +} + static void initializeFeriteParser (const langType language) { contextual_fake_count = 0; @@ -2841,6 +2849,18 @@ return def; } +extern parserDefinition* GLSLParser (void) +{ + static const char *const extensions [] = { "glsl", "frag", "vert", NULL }; + parserDefinition* def = parserNew ("GLSL"); + def->kinds = CKinds; + def->kindCount = KIND_COUNT (CKinds); + def->extensions = extensions; + def->parser2 = findCTags; + def->initialize = initializeGLSLParser; + return def; +} + extern parserDefinition* FeriteParser (void) { static const char *const extensions [] = { "fe", NULL }; Modified: trunk/tagmanager/parsers.h =================================================================== --- trunk/tagmanager/parsers.h 2008-08-26 16:30:25 UTC (rev 2907) +++ trunk/tagmanager/parsers.h 2008-08-27 12:44:54 UTC (rev 2908) @@ -45,7 +45,8 @@ HaxeParser,\ RestParser, \ HtmlParser, \ - F77Parser + F77Parser, \ + GLSLParser /* langType of each parser @@ -80,6 +81,7 @@ 28 RestParser 29 HtmlParser 30 F77Parser +31 GLSLParser */ #endif /* _PARSERS_H */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

15 years, 3 months

SF.net SVN: geany:[2907] trunk

by ntrel＠users.sourceforge.net

Revision: 2907 http://geany.svn.sourceforge.net/geany/?rev=2907&view=rev Author: ntrel Date: 2008-08-26 16:30:25 +0000 (Tue, 26 Aug 2008) Log Message: ----------- Use pointer in init_builtin_filetypes() instead of repeating filetypes[GEANY_FILETYPES_X]->... on each line. Modified Paths: -------------- trunk/ChangeLog trunk/src/filetypes.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-08-26 15:58:07 UTC (rev 2906) +++ trunk/ChangeLog 2008-08-26 16:30:25 UTC (rev 2907) @@ -8,6 +8,9 @@ Rename HighlightingStyle to GeanyLexerStyle. Add dox for highlighting_get_style(), GeanyLexerStyle, mentioning SCI_STYLEGETFORE. + * src/filetypes.c: + Use pointer in init_builtin_filetypes() instead of repeating + filetypes[GEANY_FILETYPES_X]->... on each line. 2008-08-25 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/src/filetypes.c =================================================================== --- trunk/src/filetypes.c 2008-08-26 15:58:07 UTC (rev 2906) +++ trunk/src/filetypes.c 2008-08-26 16:30:25 UTC (rev 2907) @@ -63,330 +63,367 @@ static void init_builtin_filetypes(void) { + GeanyFiletype *ft; + #define C /* these macros are only to ease navigation */ - filetypes[GEANY_FILETYPES_C]->lang = 0; - filetypes[GEANY_FILETYPES_C]->name = g_strdup("C"); - filetypes[GEANY_FILETYPES_C]->title = g_strdup_printf(_("%s source file"), "C"); - filetypes[GEANY_FILETYPES_C]->extension = g_strdup("c"); - filetypes[GEANY_FILETYPES_C]->pattern = utils_strv_new("*.c", "*.h", NULL); - filetypes[GEANY_FILETYPES_C]->comment_open = g_strdup("/*"); - filetypes[GEANY_FILETYPES_C]->comment_close = g_strdup("*/"); + ft = filetypes[GEANY_FILETYPES_C]; + ft->lang = 0; + ft->name = g_strdup("C"); + ft->title = g_strdup_printf(_("%s source file"), "C"); + ft->extension = g_strdup("c"); + ft->pattern = utils_strv_new("*.c", "*.h", NULL); + ft->comment_open = g_strdup("/*"); + ft->comment_close = g_strdup("*/"); #define CPP - filetypes[GEANY_FILETYPES_CPP]->lang = 1; - filetypes[GEANY_FILETYPES_CPP]->name = g_strdup("C++"); - filetypes[GEANY_FILETYPES_CPP]->title = g_strdup_printf(_("%s source file"), "C++"); - filetypes[GEANY_FILETYPES_CPP]->extension = g_strdup("cpp"); - filetypes[GEANY_FILETYPES_CPP]->pattern = utils_strv_new("*.cpp", "*.cxx", "*.c++", "*.cc", + ft = filetypes[GEANY_FILETYPES_CPP]; + ft->lang = 1; + ft->name = g_strdup("C++"); + ft->title = g_strdup_printf(_("%s source file"), "C++"); + ft->extension = g_strdup("cpp"); + ft->pattern = utils_strv_new("*.cpp", "*.cxx", "*.c++", "*.cc", "*.h", "*.hpp", "*.hxx", "*.h++", "*.hh", "*.C", NULL); - filetypes[GEANY_FILETYPES_CPP]->comment_open = g_strdup("//"); - filetypes[GEANY_FILETYPES_CPP]->comment_close = NULL; + ft->comment_open = g_strdup("//"); + ft->comment_close = NULL; #define CS - filetypes[GEANY_FILETYPES_CS]->lang = 25; - filetypes[GEANY_FILETYPES_CS]->name = g_strdup("C#"); - filetypes[GEANY_FILETYPES_CS]->title = g_strdup_printf(_("%s source file"), "C#"); - filetypes[GEANY_FILETYPES_CS]->extension = g_strdup("cs"); - filetypes[GEANY_FILETYPES_CS]->pattern = utils_strv_new("*.cs", "*.vala", NULL); - filetypes[GEANY_FILETYPES_CS]->comment_open = g_strdup("//"); - filetypes[GEANY_FILETYPES_CS]->comment_close = NULL; + ft = filetypes[GEANY_FILETYPES_CS]; + ft->lang = 25; + ft->name = g_strdup("C#"); + ft->title = g_strdup_printf(_("%s source file"), "C#"); + ft->extension = g_strdup("cs"); + ft->pattern = utils_strv_new("*.cs", "*.vala", NULL); + ft->comment_open = g_strdup("//"); + ft->comment_close = NULL; #define D - filetypes[GEANY_FILETYPES_D]->lang = 17; - filetypes[GEANY_FILETYPES_D]->name = g_strdup("D"); - filetypes[GEANY_FILETYPES_D]->title = g_strdup_printf(_("%s source file"), "D"); - filetypes[GEANY_FILETYPES_D]->extension = g_strdup("d"); - filetypes[GEANY_FILETYPES_D]->pattern = utils_strv_new("*.d", "*.di", NULL); - filetypes[GEANY_FILETYPES_D]->comment_open = g_strdup("//"); - filetypes[GEANY_FILETYPES_D]->comment_close = NULL; + ft = filetypes[GEANY_FILETYPES_D]; + ft->lang = 17; + ft->name = g_strdup("D"); + ft->title = g_strdup_printf(_("%s source file"), "D"); + ft->extension = g_strdup("d"); + ft->pattern = utils_strv_new("*.d", "*.di", NULL); + ft->comment_open = g_strdup("//"); + ft->comment_close = NULL; #define JAVA - filetypes[GEANY_FILETYPES_JAVA]->name = g_strdup("Java"); - filetypes[GEANY_FILETYPES_JAVA]->lang = 2; - filetypes[GEANY_FILETYPES_JAVA]->title = g_strdup_printf(_("%s source file"), "Java"); - filetypes[GEANY_FILETYPES_JAVA]->extension = g_strdup("java"); - filetypes[GEANY_FILETYPES_JAVA]->pattern = utils_strv_new("*.java", "*.jsp", NULL); - filetypes[GEANY_FILETYPES_JAVA]->comment_open = g_strdup("/*"); - filetypes[GEANY_FILETYPES_JAVA]->comment_close = g_strdup("*/"); + ft = filetypes[GEANY_FILETYPES_JAVA]; + ft->lang = 2; + ft->name = g_strdup("Java"); + ft->title = g_strdup_printf(_("%s source file"), "Java"); + ft->extension = g_strdup("java"); + ft->pattern = utils_strv_new("*.java", "*.jsp", NULL); + ft->comment_open = g_strdup("/*"); + ft->comment_close = g_strdup("*/"); #define PAS /* to avoid warnings when building under Windows, the symbol PASCAL is there defined */ - filetypes[GEANY_FILETYPES_PASCAL]->lang = 4; - filetypes[GEANY_FILETYPES_PASCAL]->name = g_strdup("Pascal"); - filetypes[GEANY_FILETYPES_PASCAL]->title = g_strdup_printf(_("%s source file"), "Pascal"); - filetypes[GEANY_FILETYPES_PASCAL]->extension = g_strdup("pas"); - filetypes[GEANY_FILETYPES_PASCAL]->pattern = utils_strv_new("*.pas", "*.pp", "*.inc", "*.dpr", + ft = filetypes[GEANY_FILETYPES_PASCAL]; + ft->lang = 4; + ft->name = g_strdup("Pascal"); + ft->title = g_strdup_printf(_("%s source file"), "Pascal"); + ft->extension = g_strdup("pas"); + ft->pattern = utils_strv_new("*.pas", "*.pp", "*.inc", "*.dpr", "*.dpk", NULL); - filetypes[GEANY_FILETYPES_PASCAL]->comment_open = g_strdup("{"); - filetypes[GEANY_FILETYPES_PASCAL]->comment_close = g_strdup("}"); + ft->comment_open = g_strdup("{"); + ft->comment_close = g_strdup("}"); #define ASM - filetypes[GEANY_FILETYPES_ASM]->lang = 9; - filetypes[GEANY_FILETYPES_ASM]->name = g_strdup("ASM"); - filetypes[GEANY_FILETYPES_ASM]->title = g_strdup_printf(_("%s source file"), "Assembler"); - filetypes[GEANY_FILETYPES_ASM]->extension = g_strdup("asm"); - filetypes[GEANY_FILETYPES_ASM]->pattern = utils_strv_new("*.asm", NULL); - filetypes[GEANY_FILETYPES_ASM]->comment_open = g_strdup(";"); - filetypes[GEANY_FILETYPES_ASM]->comment_close = NULL; + ft = filetypes[GEANY_FILETYPES_ASM]; + ft->lang = 9; + ft->name = g_strdup("ASM"); + ft->title = g_strdup_printf(_("%s source file"), "Assembler"); + ft->extension = g_strdup("asm"); + ft->pattern = utils_strv_new("*.asm", NULL); + ft->comment_open = g_strdup(";"); + ft->comment_close = NULL; #define BASIC - filetypes[GEANY_FILETYPES_BASIC]->lang = 26; - filetypes[GEANY_FILETYPES_BASIC]->name = g_strdup("FreeBasic"); - filetypes[GEANY_FILETYPES_BASIC]->title = g_strdup_printf(_("%s source file"), "FreeBasic"); - filetypes[GEANY_FILETYPES_BASIC]->extension = g_strdup("bas"); - filetypes[GEANY_FILETYPES_BASIC]->pattern = utils_strv_new("*.bas", "*.bi", NULL); - filetypes[GEANY_FILETYPES_BASIC]->comment_open = g_strdup("'"); - filetypes[GEANY_FILETYPES_BASIC]->comment_close = NULL; + ft = filetypes[GEANY_FILETYPES_BASIC]; + ft->lang = 26; + ft->name = g_strdup("FreeBasic"); + ft->title = g_strdup_printf(_("%s source file"), "FreeBasic"); + ft->extension = g_strdup("bas"); + ft->pattern = utils_strv_new("*.bas", "*.bi", NULL); + ft->comment_open = g_strdup("'"); + ft->comment_close = NULL; #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 (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; + ft = filetypes[GEANY_FILETYPES_FORTRAN]; + ft->lang = 18; + ft->name = g_strdup("Fortran"); + ft->title = g_strdup_printf(_("%s source file"), "Fortran (F90)"); + ft->extension = g_strdup("f90"); + ft->pattern = utils_strv_new("*.f90", "*.f95", "*.f03", NULL); + ft->comment_open = g_strdup("c"); + ft->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; + ft = filetypes[GEANY_FILETYPES_F77]; + ft->lang = 30; + ft->name = g_strdup("F77"); + ft->title = g_strdup_printf(_("%s source file"), "Fortran (F77)"); + ft->extension = g_strdup("f"); + ft->pattern = utils_strv_new("*.f", "*.for", "*.ftn", "*.f77", NULL); + ft->comment_open = g_strdup("c"); + ft->comment_close = NULL; #define CAML - filetypes[GEANY_FILETYPES_CAML]->lang = -2; - filetypes[GEANY_FILETYPES_CAML]->name = g_strdup("CAML"); - filetypes[GEANY_FILETYPES_CAML]->title = g_strdup_printf(_("%s source file"), "(O)Caml"); - filetypes[GEANY_FILETYPES_CAML]->extension = g_strdup("ml"); - filetypes[GEANY_FILETYPES_CAML]->pattern = utils_strv_new("*.ml", "*.mli", NULL); - filetypes[GEANY_FILETYPES_CAML]->comment_open = g_strdup("(*"); - filetypes[GEANY_FILETYPES_CAML]->comment_close = g_strdup("*)"); + ft = filetypes[GEANY_FILETYPES_CAML]; + ft->lang = -2; + ft->name = g_strdup("CAML"); + ft->title = g_strdup_printf(_("%s source file"), "(O)Caml"); + ft->extension = g_strdup("ml"); + ft->pattern = utils_strv_new("*.ml", "*.mli", NULL); + ft->comment_open = g_strdup("(*"); + ft->comment_close = g_strdup("*)"); #define PERL - filetypes[GEANY_FILETYPES_PERL]->lang = 5; - filetypes[GEANY_FILETYPES_PERL]->name = g_strdup("Perl"); - filetypes[GEANY_FILETYPES_PERL]->title = g_strdup_printf(_("%s source file"), "Perl"); - filetypes[GEANY_FILETYPES_PERL]->extension = g_strdup("pl"); - filetypes[GEANY_FILETYPES_PERL]->pattern = utils_strv_new("*.pl", "*.perl", "*.pm", "*.agi", + ft = filetypes[GEANY_FILETYPES_PERL]; + ft->lang = 5; + ft->name = g_strdup("Perl"); + ft->title = g_strdup_printf(_("%s source file"), "Perl"); + ft->extension = g_strdup("pl"); + ft->pattern = utils_strv_new("*.pl", "*.perl", "*.pm", "*.agi", "*.pod", NULL); - filetypes[GEANY_FILETYPES_PERL]->comment_open = g_strdup("#"); - filetypes[GEANY_FILETYPES_PERL]->comment_close = NULL; + ft->comment_open = g_strdup("#"); + ft->comment_close = NULL; #define PHP - filetypes[GEANY_FILETYPES_PHP]->lang = 6; - filetypes[GEANY_FILETYPES_PHP]->name = g_strdup("PHP"); - filetypes[GEANY_FILETYPES_PHP]->title = g_strdup_printf(_("%s source file"), "PHP"); - filetypes[GEANY_FILETYPES_PHP]->extension = g_strdup("php"); - filetypes[GEANY_FILETYPES_PHP]->pattern = utils_strv_new("*.php", "*.php3", "*.php4", "*.php5", + ft = filetypes[GEANY_FILETYPES_PHP]; + ft->lang = 6; + ft->name = g_strdup("PHP"); + ft->title = g_strdup_printf(_("%s source file"), "PHP"); + ft->extension = g_strdup("php"); + ft->pattern = utils_strv_new("*.php", "*.php3", "*.php4", "*.php5", "*.phtml", NULL); - filetypes[GEANY_FILETYPES_PHP]->comment_open = g_strdup("//"); - filetypes[GEANY_FILETYPES_PHP]->comment_close = NULL; + ft->comment_open = g_strdup("//"); + ft->comment_close = NULL; #define JAVASCRIPT - filetypes[GEANY_FILETYPES_JS]->lang = 23; - filetypes[GEANY_FILETYPES_JS]->name = g_strdup("Javascript"); - filetypes[GEANY_FILETYPES_JS]->title = g_strdup_printf(_("%s source file"), "Javascript"); - filetypes[GEANY_FILETYPES_JS]->extension = g_strdup("js"); - filetypes[GEANY_FILETYPES_JS]->pattern = utils_strv_new("*.js", NULL); - filetypes[GEANY_FILETYPES_JS]->comment_open = g_strdup("//"); - filetypes[GEANY_FILETYPES_JS]->comment_close = NULL; + ft = filetypes[GEANY_FILETYPES_JS]; + ft->lang = 23; + ft->name = g_strdup("Javascript"); + ft->title = g_strdup_printf(_("%s source file"), "Javascript"); + ft->extension = g_strdup("js"); + ft->pattern = utils_strv_new("*.js", NULL); + ft->comment_open = g_strdup("//"); + ft->comment_close = NULL; #define PYTHON - filetypes[GEANY_FILETYPES_PYTHON]->lang = 7; - filetypes[GEANY_FILETYPES_PYTHON]->name = g_strdup("Python"); - filetypes[GEANY_FILETYPES_PYTHON]->title = g_strdup_printf(_("%s source file"), "Python"); - filetypes[GEANY_FILETYPES_PYTHON]->extension = g_strdup("py"); - filetypes[GEANY_FILETYPES_PYTHON]->pattern = utils_strv_new("*.py", "*.pyw", NULL); - filetypes[GEANY_FILETYPES_PYTHON]->comment_open = g_strdup("#"); - filetypes[GEANY_FILETYPES_PYTHON]->comment_close = NULL; + ft = filetypes[GEANY_FILETYPES_PYTHON]; + ft->lang = 7; + ft->name = g_strdup("Python"); + ft->title = g_strdup_printf(_("%s source file"), "Python"); + ft->extension = g_strdup("py"); + ft->pattern = utils_strv_new("*.py", "*.pyw", NULL); + ft->comment_open = g_strdup("#"); + ft->comment_close = NULL; #define RUBY - filetypes[GEANY_FILETYPES_RUBY]->lang = 14; - filetypes[GEANY_FILETYPES_RUBY]->name = g_strdup("Ruby"); - filetypes[GEANY_FILETYPES_RUBY]->title = g_strdup_printf(_("%s source file"), "Ruby"); - filetypes[GEANY_FILETYPES_RUBY]->extension = g_strdup("rb"); - filetypes[GEANY_FILETYPES_RUBY]->pattern = utils_strv_new("*.rb", "*.rhtml", "*.ruby", NULL); - filetypes[GEANY_FILETYPES_RUBY]->comment_open = g_strdup("#"); - filetypes[GEANY_FILETYPES_RUBY]->comment_close = NULL; + ft = filetypes[GEANY_FILETYPES_RUBY]; + ft->lang = 14; + ft->name = g_strdup("Ruby"); + ft->title = g_strdup_printf(_("%s source file"), "Ruby"); + ft->extension = g_strdup("rb"); + ft->pattern = utils_strv_new("*.rb", "*.rhtml", "*.ruby", NULL); + ft->comment_open = g_strdup("#"); + ft->comment_close = NULL; #define TCL - filetypes[GEANY_FILETYPES_TCL]->lang = 15; - filetypes[GEANY_FILETYPES_TCL]->name = g_strdup("Tcl"); - filetypes[GEANY_FILETYPES_TCL]->title = g_strdup_printf(_("%s source file"), "Tcl"); - filetypes[GEANY_FILETYPES_TCL]->extension = g_strdup("tcl"); - filetypes[GEANY_FILETYPES_TCL]->pattern = utils_strv_new("*.tcl", "*.tk", "*.wish", NULL); - filetypes[GEANY_FILETYPES_TCL]->comment_open = g_strdup("#"); - filetypes[GEANY_FILETYPES_TCL]->comment_close = NULL; + ft = filetypes[GEANY_FILETYPES_TCL]; + ft->lang = 15; + ft->name = g_strdup("Tcl"); + ft->title = g_strdup_printf(_("%s source file"), "Tcl"); + ft->extension = g_strdup("tcl"); + ft->pattern = utils_strv_new("*.tcl", "*.tk", "*.wish", NULL); + ft->comment_open = g_strdup("#"); + ft->comment_close = NULL; #define LUA - filetypes[GEANY_FILETYPES_LUA]->lang = 22; - filetypes[GEANY_FILETYPES_LUA]->name = g_strdup("Lua"); - filetypes[GEANY_FILETYPES_LUA]->title = g_strdup_printf(_("%s source file"), "Lua"); - filetypes[GEANY_FILETYPES_LUA]->extension = g_strdup("lua"); - filetypes[GEANY_FILETYPES_LUA]->pattern = utils_strv_new("*.lua", NULL); - filetypes[GEANY_FILETYPES_LUA]->comment_open = g_strdup("--"); - filetypes[GEANY_FILETYPES_LUA]->comment_close = NULL; + ft = filetypes[GEANY_FILETYPES_LUA]; + ft->lang = 22; + ft->name = g_strdup("Lua"); + ft->title = g_strdup_printf(_("%s source file"), "Lua"); + ft->extension = g_strdup("lua"); + ft->pattern = utils_strv_new("*.lua", NULL); + ft->comment_open = g_strdup("--"); + ft->comment_close = NULL; #define FERITE - filetypes[GEANY_FILETYPES_FERITE]->lang = 19; - filetypes[GEANY_FILETYPES_FERITE]->name = g_strdup("Ferite"); - filetypes[GEANY_FILETYPES_FERITE]->title = g_strdup_printf(_("%s source file"), "Ferite"); - filetypes[GEANY_FILETYPES_FERITE]->extension = g_strdup("fe"); - filetypes[GEANY_FILETYPES_FERITE]->pattern = utils_strv_new("*.fe", NULL); - filetypes[GEANY_FILETYPES_FERITE]->comment_open = g_strdup("/*"); - filetypes[GEANY_FILETYPES_FERITE]->comment_close = g_strdup("*/"); + ft = filetypes[GEANY_FILETYPES_FERITE]; + ft->lang = 19; + ft->name = g_strdup("Ferite"); + ft->title = g_strdup_printf(_("%s source file"), "Ferite"); + ft->extension = g_strdup("fe"); + ft->pattern = utils_strv_new("*.fe", NULL); + ft->comment_open = g_strdup("/*"); + ft->comment_close = g_strdup("*/"); #define HASKELL - filetypes[GEANY_FILETYPES_HASKELL]->lang = 24; - filetypes[GEANY_FILETYPES_HASKELL]->name = g_strdup("Haskell"); - filetypes[GEANY_FILETYPES_HASKELL]->title = g_strdup_printf(_("%s source file"), "Haskell"); - filetypes[GEANY_FILETYPES_HASKELL]->extension = g_strdup("hs"); - filetypes[GEANY_FILETYPES_HASKELL]->pattern = utils_strv_new("*.hs", "*.lhs", NULL); - filetypes[GEANY_FILETYPES_HASKELL]->comment_open = g_strdup("--"); - filetypes[GEANY_FILETYPES_HASKELL]->comment_close = NULL; + ft = filetypes[GEANY_FILETYPES_HASKELL]; + ft->lang = 24; + ft->name = g_strdup("Haskell"); + ft->title = g_strdup_printf(_("%s source file"), "Haskell"); + ft->extension = g_strdup("hs"); + ft->pattern = utils_strv_new("*.hs", "*.lhs", NULL); + ft->comment_open = g_strdup("--"); + ft->comment_close = NULL; #define SH - filetypes[GEANY_FILETYPES_SH]->lang = 16; - filetypes[GEANY_FILETYPES_SH]->name = g_strdup("Sh"); - filetypes[GEANY_FILETYPES_SH]->title = g_strdup(_("Shell script file")); - filetypes[GEANY_FILETYPES_SH]->extension = g_strdup("sh"); - filetypes[GEANY_FILETYPES_SH]->pattern = utils_strv_new("*.sh", "configure", "configure.in", + ft = filetypes[GEANY_FILETYPES_SH]; + ft->lang = 16; + ft->name = g_strdup("Sh"); + ft->title = g_strdup(_("Shell script file")); + ft->extension = g_strdup("sh"); + ft->pattern = utils_strv_new("*.sh", "configure", "configure.in", "configure.in.in", "configure.ac", "*.ksh", "*.zsh", "*.ash", "*.bash", NULL); - filetypes[GEANY_FILETYPES_SH]->comment_open = g_strdup("#"); - filetypes[GEANY_FILETYPES_SH]->comment_close = NULL; + ft->comment_open = g_strdup("#"); + ft->comment_close = NULL; #define MAKE - filetypes[GEANY_FILETYPES_MAKE]->lang = 3; - filetypes[GEANY_FILETYPES_MAKE]->name = g_strdup("Make"); - filetypes[GEANY_FILETYPES_MAKE]->title = g_strdup(_("Makefile")); - filetypes[GEANY_FILETYPES_MAKE]->extension = g_strdup("mak"); - filetypes[GEANY_FILETYPES_MAKE]->pattern = utils_strv_new( + ft = filetypes[GEANY_FILETYPES_MAKE]; + ft->lang = 3; + ft->name = g_strdup("Make"); + ft->title = g_strdup(_("Makefile")); + ft->extension = g_strdup("mak"); + ft->pattern = utils_strv_new( "*.mak", "*.mk", "GNUmakefile", "makefile", "Makefile", "makefile.*", "Makefile.*", NULL); - filetypes[GEANY_FILETYPES_MAKE]->comment_open = g_strdup("#"); - filetypes[GEANY_FILETYPES_MAKE]->comment_close = NULL; + ft->comment_open = g_strdup("#"); + ft->comment_close = NULL; #define XML - filetypes[GEANY_FILETYPES_XML]->lang = -2; - filetypes[GEANY_FILETYPES_XML]->name = g_strdup("XML"); - filetypes[GEANY_FILETYPES_XML]->title = g_strdup(_("XML document")); - filetypes[GEANY_FILETYPES_XML]->extension = g_strdup("xml"); - filetypes[GEANY_FILETYPES_XML]->pattern = utils_strv_new( + ft = filetypes[GEANY_FILETYPES_XML]; + ft->lang = -2; + ft->name = g_strdup("XML"); + ft->title = g_strdup(_("XML document")); + ft->extension = g_strdup("xml"); + ft->pattern = utils_strv_new( "*.xml", "*.sgml", "*.xsl", "*.xslt", "*.xsd", "*.xhtml", NULL); - filetypes[GEANY_FILETYPES_XML]->comment_open = g_strdup(""); + ft->comment_open = g_strdup(""); #define DOCBOOK - filetypes[GEANY_FILETYPES_DOCBOOK]->lang = 12; - filetypes[GEANY_FILETYPES_DOCBOOK]->name = g_strdup("Docbook"); - filetypes[GEANY_FILETYPES_DOCBOOK]->title = g_strdup_printf(_("%s source file"), "Docbook"); - filetypes[GEANY_FILETYPES_DOCBOOK]->extension = g_strdup("docbook"); - filetypes[GEANY_FILETYPES_DOCBOOK]->pattern = utils_strv_new("*.docbook", NULL); - filetypes[GEANY_FILETYPES_DOCBOOK]->comment_open = g_strdup(""); + ft = filetypes[GEANY_FILETYPES_DOCBOOK]; + ft->lang = 12; + ft->name = g_strdup("Docbook"); + ft->title = g_strdup_printf(_("%s source file"), "Docbook"); + ft->extension = g_strdup("docbook"); + ft->pattern = utils_strv_new("*.docbook", NULL); + ft->comment_open = g_strdup(""); #define HTML - filetypes[GEANY_FILETYPES_HTML]->lang = 29; - filetypes[GEANY_FILETYPES_HTML]->name = g_strdup("HTML"); - filetypes[GEANY_FILETYPES_HTML]->title = g_strdup_printf(_("%s source file"), "HTML"); - filetypes[GEANY_FILETYPES_HTML]->extension = g_strdup("html"); - filetypes[GEANY_FILETYPES_HTML]->pattern = utils_strv_new( + ft = filetypes[GEANY_FILETYPES_HTML]; + ft->lang = 29; + ft->name = g_strdup("HTML"); + ft->title = g_strdup_printf(_("%s source file"), "HTML"); + ft->extension = g_strdup("html"); + ft->pattern = utils_strv_new( "*.htm", "*.html", "*.shtml", "*.hta", "*.htd", "*.htt", "*.cfm", NULL); - filetypes[GEANY_FILETYPES_HTML]->comment_open = g_strdup(""); + ft->comment_open = g_strdup(""); #define CSS - filetypes[GEANY_FILETYPES_CSS]->lang = 13; - filetypes[GEANY_FILETYPES_CSS]->name = g_strdup("CSS"); - filetypes[GEANY_FILETYPES_CSS]->title = g_strdup(_("Cascading StyleSheet")); - filetypes[GEANY_FILETYPES_CSS]->extension = g_strdup("css"); - filetypes[GEANY_FILETYPES_CSS]->pattern = utils_strv_new("*.css", NULL); - filetypes[GEANY_FILETYPES_CSS]->comment_open = g_strdup("/*"); - filetypes[GEANY_FILETYPES_CSS]->comment_close = g_strdup("*/"); + ft = filetypes[GEANY_FILETYPES_CSS]; + ft->lang = 13; + ft->name = g_strdup("CSS"); + ft->title = g_strdup(_("Cascading StyleSheet")); + ft->extension = g_strdup("css"); + ft->pattern = utils_strv_new("*.css", NULL); + ft->comment_open = g_strdup("/*"); + ft->comment_close = g_strdup("*/"); #define SQL - filetypes[GEANY_FILETYPES_SQL]->lang = 11; - filetypes[GEANY_FILETYPES_SQL]->name = g_strdup("SQL"); - filetypes[GEANY_FILETYPES_SQL]->title = g_strdup(_("SQL Dump file")); - filetypes[GEANY_FILETYPES_SQL]->extension = g_strdup("sql"); - filetypes[GEANY_FILETYPES_SQL]->pattern = utils_strv_new("*.sql", NULL); - filetypes[GEANY_FILETYPES_SQL]->comment_open = g_strdup("/*"); - filetypes[GEANY_FILETYPES_SQL]->comment_close = g_strdup("*/"); + ft = filetypes[GEANY_FILETYPES_SQL]; + ft->lang = 11; + ft->name = g_strdup("SQL"); + ft->title = g_strdup(_("SQL Dump file")); + ft->extension = g_strdup("sql"); + ft->pattern = utils_strv_new("*.sql", NULL); + ft->comment_open = g_strdup("/*"); + ft->comment_close = g_strdup("*/"); #define LATEX - filetypes[GEANY_FILETYPES_LATEX]->lang = 8; - filetypes[GEANY_FILETYPES_LATEX]->name = g_strdup("LaTeX"); - filetypes[GEANY_FILETYPES_LATEX]->title = g_strdup_printf(_("%s source file"), "LaTeX"); - filetypes[GEANY_FILETYPES_LATEX]->extension = g_strdup("tex"); - filetypes[GEANY_FILETYPES_LATEX]->pattern = utils_strv_new("*.tex", "*.sty", "*.idx", "*.ltx", NULL); - filetypes[GEANY_FILETYPES_LATEX]->comment_open = g_strdup("%"); - filetypes[GEANY_FILETYPES_LATEX]->comment_close = NULL; + ft = filetypes[GEANY_FILETYPES_LATEX]; + ft->lang = 8; + ft->name = g_strdup("LaTeX"); + ft->title = g_strdup_printf(_("%s source file"), "LaTeX"); + ft->extension = g_strdup("tex"); + ft->pattern = utils_strv_new("*.tex", "*.sty", "*.idx", "*.ltx", NULL); + ft->comment_open = g_strdup("%"); + ft->comment_close = NULL; #define OMS - filetypes[GEANY_FILETYPES_OMS]->lang = -2; - filetypes[GEANY_FILETYPES_OMS]->name = g_strdup("O-Matrix"); - filetypes[GEANY_FILETYPES_OMS]->title = g_strdup_printf(_("%s source file"), "O-Matrix"); - filetypes[GEANY_FILETYPES_OMS]->extension = g_strdup("oms"); - filetypes[GEANY_FILETYPES_OMS]->pattern = utils_strv_new("*.oms", NULL); - filetypes[GEANY_FILETYPES_OMS]->comment_open = g_strdup("#"); - filetypes[GEANY_FILETYPES_OMS]->comment_close = NULL; + ft = filetypes[GEANY_FILETYPES_OMS]; + ft->lang = -2; + ft->name = g_strdup("O-Matrix"); + ft->title = g_strdup_printf(_("%s source file"), "O-Matrix"); + ft->extension = g_strdup("oms"); + ft->pattern = utils_strv_new("*.oms", NULL); + ft->comment_open = g_strdup("#"); + ft->comment_close = NULL; #define VHDL - filetypes[GEANY_FILETYPES_VHDL]->lang = 21; - filetypes[GEANY_FILETYPES_VHDL]->name = g_strdup("VHDL"); - filetypes[GEANY_FILETYPES_VHDL]->title = g_strdup_printf(_("%s source file"), "VHDL"); - filetypes[GEANY_FILETYPES_VHDL]->extension = g_strdup("vhd"); - filetypes[GEANY_FILETYPES_VHDL]->pattern = utils_strv_new("*.vhd", "*.vhdl", NULL); - filetypes[GEANY_FILETYPES_VHDL]->comment_open = g_strdup("--"); - filetypes[GEANY_FILETYPES_VHDL]->comment_close = NULL; + ft = filetypes[GEANY_FILETYPES_VHDL]; + ft->lang = 21; + ft->name = g_strdup("VHDL"); + ft->title = g_strdup_printf(_("%s source file"), "VHDL"); + ft->extension = g_strdup("vhd"); + ft->pattern = utils_strv_new("*.vhd", "*.vhdl", NULL); + ft->comment_open = g_strdup("--"); + ft->comment_close = NULL; #define DIFF - filetypes[GEANY_FILETYPES_DIFF]->lang = 20; - filetypes[GEANY_FILETYPES_DIFF]->name = g_strdup("Diff"); - filetypes[GEANY_FILETYPES_DIFF]->title = g_strdup(_("Diff file")); - filetypes[GEANY_FILETYPES_DIFF]->extension = g_strdup("diff"); - filetypes[GEANY_FILETYPES_DIFF]->pattern = utils_strv_new("*.diff", "*.patch", "*.rej", NULL); - filetypes[GEANY_FILETYPES_DIFF]->comment_open = g_strdup("#"); - filetypes[GEANY_FILETYPES_DIFF]->comment_close = NULL; + ft = filetypes[GEANY_FILETYPES_DIFF]; + ft->lang = 20; + ft->name = g_strdup("Diff"); + ft->title = g_strdup(_("Diff file")); + ft->extension = g_strdup("diff"); + ft->pattern = utils_strv_new("*.diff", "*.patch", "*.rej", NULL); + ft->comment_open = g_strdup("#"); + ft->comment_close = NULL; #define CONF - filetypes[GEANY_FILETYPES_CONF]->lang = 10; - filetypes[GEANY_FILETYPES_CONF]->name = g_strdup("Conf"); - filetypes[GEANY_FILETYPES_CONF]->title = g_strdup(_("Config file")); - filetypes[GEANY_FILETYPES_CONF]->extension = g_strdup("conf"); - filetypes[GEANY_FILETYPES_CONF]->pattern = utils_strv_new("*.conf", "*.ini", "config", "*rc", + ft = filetypes[GEANY_FILETYPES_CONF]; + ft->lang = 10; + ft->name = g_strdup("Conf"); + ft->title = g_strdup(_("Config file")); + ft->extension = g_strdup("conf"); + ft->pattern = utils_strv_new("*.conf", "*.ini", "config", "*rc", "*.cfg", NULL); - filetypes[GEANY_FILETYPES_CONF]->comment_open = g_strdup("#"); - filetypes[GEANY_FILETYPES_CONF]->comment_close = NULL; + ft->comment_open = g_strdup("#"); + ft->comment_close = NULL; #define HAXE - filetypes[GEANY_FILETYPES_HAXE]->lang = 27; - filetypes[GEANY_FILETYPES_HAXE]->name = g_strdup("Haxe"); - filetypes[GEANY_FILETYPES_HAXE]->title = g_strdup_printf(_("%s source file"), "Haxe"); - filetypes[GEANY_FILETYPES_HAXE]->extension = g_strdup("hx"); - filetypes[GEANY_FILETYPES_HAXE]->pattern = utils_strv_new("*.hx", NULL); - filetypes[GEANY_FILETYPES_HAXE]->comment_open = g_strdup("//"); - filetypes[GEANY_FILETYPES_HAXE]->comment_close = NULL; + ft = filetypes[GEANY_FILETYPES_HAXE]; + ft->lang = 27; + ft->name = g_strdup("Haxe"); + ft->title = g_strdup_printf(_("%s source file"), "Haxe"); + ft->extension = g_strdup("hx"); + ft->pattern = utils_strv_new("*.hx", NULL); + ft->comment_open = g_strdup("//"); + ft->comment_close = NULL; #define REST - filetypes[GEANY_FILETYPES_REST]->lang = 28; - filetypes[GEANY_FILETYPES_REST]->name = g_strdup("reStructuredText"); - filetypes[GEANY_FILETYPES_REST]->title = g_strdup(_("reStructuredText file")); - filetypes[GEANY_FILETYPES_REST]->extension = g_strdup("rst"); - filetypes[GEANY_FILETYPES_REST]->pattern = utils_strv_new( + ft = filetypes[GEANY_FILETYPES_REST]; + ft->lang = 28; + ft->name = g_strdup("reStructuredText"); + ft->title = g_strdup(_("reStructuredText file")); + ft->extension = g_strdup("rst"); + ft->pattern = utils_strv_new( "*.rest", "*.reST", "*.rst", NULL); - filetypes[GEANY_FILETYPES_REST]->comment_open = NULL; - filetypes[GEANY_FILETYPES_REST]->comment_close = NULL; + ft->comment_open = NULL; + ft->comment_close = NULL; #define ALL - filetypes[GEANY_FILETYPES_NONE]->name = g_strdup("None"); - filetypes[GEANY_FILETYPES_NONE]->lang = -2; - filetypes[GEANY_FILETYPES_NONE]->title = g_strdup(_("All files")); - filetypes[GEANY_FILETYPES_NONE]->extension = g_strdup("*"); - filetypes[GEANY_FILETYPES_NONE]->pattern = utils_strv_new("*", NULL); - filetypes[GEANY_FILETYPES_NONE]->comment_open = NULL; - filetypes[GEANY_FILETYPES_NONE]->comment_close = NULL; + ft = filetypes[GEANY_FILETYPES_NONE]; + ft->lang = -2; + ft->name = g_strdup("None"); + ft->title = g_strdup(_("All files")); + ft->extension = g_strdup("*"); + ft->pattern = utils_strv_new("*", NULL); + ft->comment_open = NULL; + ft->comment_close = NULL; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

15 years, 3 months

SF.net SVN: geany:[2906] branches/split-window-plugin

by ntrel＠users.sourceforge.net

Revision: 2906 http://geany.svn.sourceforge.net/geany/?rev=2906&view=rev Author: ntrel Date: 2008-08-26 15:58:07 +0000 (Tue, 26 Aug 2008) Log Message: ----------- Add Split Window plugin (work-in-progress). Modified Paths: -------------- branches/split-window-plugin/ChangeLog branches/split-window-plugin/plugins/Makefile.am branches/split-window-plugin/plugins/makefile.win32 branches/split-window-plugin/po/POTFILES.in branches/split-window-plugin/src/plugindata.h branches/split-window-plugin/src/plugins.c Added Paths: ----------- branches/split-window-plugin/plugins/splitwindow.c Modified: branches/split-window-plugin/ChangeLog =================================================================== --- branches/split-window-plugin/ChangeLog 2008-08-26 15:25:50 UTC (rev 2905) +++ branches/split-window-plugin/ChangeLog 2008-08-26 15:58:07 UTC (rev 2906) @@ -1,5 +1,12 @@ 2008-08-26 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * src/plugindata.h, src/plugins.c, po/POTFILES.in, + plugins/splitwindow.c, plugins/Makefile.am, plugins/makefile.win32: + Add Split Window plugin (work-in-progress). + + +2008-08-26 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * src/highlighting.c: Add assert statements to check that the StyleSet styling arrays are not exceeded. Modified: branches/split-window-plugin/plugins/Makefile.am =================================================================== --- branches/split-window-plugin/plugins/Makefile.am 2008-08-26 15:25:50 UTC (rev 2905) +++ branches/split-window-plugin/plugins/Makefile.am 2008-08-26 15:58:07 UTC (rev 2906) @@ -16,6 +16,7 @@ vcdiff_la_LDFLAGS = -module -avoid-version autosave_la_LDFLAGS = -module -avoid-version filebrowser_la_LDFLAGS = -module -avoid-version +splitwindow_la_LDFLAGS = -module -avoid-version if PLUGINS @@ -26,7 +27,8 @@ export.la \ vcdiff.la \ autosave.la \ - filebrowser.la + filebrowser.la \ + splitwindow.la # Plugins not to be installed noinst_LTLIBRARIES = \ @@ -39,6 +41,7 @@ vcdiff_la_SOURCES = vcdiff.c autosave_la_SOURCES = autosave.c filebrowser_la_SOURCES = filebrowser.c +splitwindow_la_SOURCES = splitwindow.c # instead of linking against all in $(GTK_LIBS), we link only against needed libs demoplugin_la_LIBADD = $(GTK_LIBS) @@ -48,6 +51,7 @@ vcdiff_la_LIBADD = $(GTK_LIBS) autosave_la_LIBADD = $(GTK_LIBS) filebrowser_la_LIBADD = $(GTK_LIBS) +splitwindow_la_LIBADD = $(GTK_LIBS) endif # PLUGINS Modified: branches/split-window-plugin/plugins/makefile.win32 =================================================================== --- branches/split-window-plugin/plugins/makefile.win32 2008-08-26 15:25:50 UTC (rev 2905) +++ branches/split-window-plugin/plugins/makefile.win32 2008-08-26 15:58:07 UTC (rev 2906) @@ -54,6 +54,7 @@ demoplugin.dll \ classbuilder.dll \ export.dll \ + splitwindow.dll \ vcdiff.dll \ autosave.dll \ filebrowser.dll Added: branches/split-window-plugin/plugins/splitwindow.c =================================================================== --- branches/split-window-plugin/plugins/splitwindow.c (rev 0) +++ branches/split-window-plugin/plugins/splitwindow.c 2008-08-26 15:58:07 UTC (rev 2906) @@ -0,0 +1,194 @@ +/* + * splitview.c + * + * Copyright 2008 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ + +#include "geany.h" +#include <glib/gi18n.h> +#include "Scintilla.h" +#include "ScintillaWidget.h" +#include "SciLexer.h" + +#include "ui_utils.h" +#include "document.h" +#include "editor.h" +#include "plugindata.h" +#include "pluginmacros.h" + + +PLUGIN_VERSION_CHECK(76) +PLUGIN_SET_INFO(_("Split Window"), _("Splits the editor view into two windows."), + "0.1", _("The Geany developer team")) + + +GeanyData *geany_data; +GeanyFunctions *geany_functions; + +static GeanyEditor *our_editor = NULL; + + +static gint sci_get_value(ScintillaObject *sci, gint message_id, gint param) +{ + return p_sci->send_message(sci, message_id, param, 0); +} + + +static void set_styles(ScintillaObject *oldsci, ScintillaObject *newsci) +{ + gint style_id; + + for (style_id = 0; style_id <= 127; style_id++) + { + gint val; + + val = sci_get_value(oldsci, SCI_STYLEGETFORE, style_id); + p_sci->send_message(newsci, SCI_STYLESETFORE, style_id, val); + val = sci_get_value(oldsci, SCI_STYLEGETBACK, style_id); + p_sci->send_message(newsci, SCI_STYLESETBACK, style_id, val); + val = sci_get_value(oldsci, SCI_STYLEGETBOLD, style_id); + p_sci->send_message(newsci, SCI_STYLESETBOLD, style_id, val); + val = sci_get_value(oldsci, SCI_STYLEGETITALIC, style_id); + p_sci->send_message(newsci, SCI_STYLESETITALIC, style_id, val); + } +} + + +static void sci_set_font(ScintillaObject *sci, gint style, const gchar *font, + G_GNUC_UNUSED gint size) +{ + p_sci->send_message(sci, SCI_STYLESETFONT, style, (sptr_t) font); + p_sci->send_message(sci, SCI_STYLESETSIZE, style, size); +} + + +static void set_font(ScintillaObject *sci, const gchar *font_name, gint size) +{ + gint style; + + for (style = 0; style <= 127; style++) + sci_set_font(sci, style, font_name, size); + /* line number and braces */ + sci_set_font(sci, STYLE_LINENUMBER, font_name, size); + sci_set_font(sci, STYLE_BRACELIGHT, font_name, size); + sci_set_font(sci, STYLE_BRACEBAD, font_name, size); +} + + +static void update_font(ScintillaObject *sci, const gchar *font_name, gint size) +{ + gchar *fname; + PangoFontDescription *font_desc; + + g_return_if_fail(font_name != NULL); + + font_desc = pango_font_description_from_string(font_name); + + fname = g_strdup_printf("!%s", pango_font_description_get_family(font_desc)); + size = pango_font_description_get_size(font_desc) / PANGO_SCALE; + + set_font(sci, fname, size); + + g_free(fname); + pango_font_description_free(font_desc); +} + + +/* line numbers visibility */ +static void set_line_numbers(ScintillaObject * sci, gboolean set, gint extra_width) +{ + if (set) + { + gchar tmp_str[15]; + gint len = p_sci->send_message(sci, SCI_GETLINECOUNT, 0, 0); + gint width; + g_snprintf(tmp_str, 15, "_%d%d", len, extra_width); + width = p_sci->send_message(sci, SCI_TEXTWIDTH, STYLE_LINENUMBER, (sptr_t) tmp_str); + p_sci->send_message(sci, SCI_SETMARGINWIDTHN, 0, width); + p_sci->send_message(sci, SCI_SETMARGINSENSITIVEN, 0, FALSE); /* use default behaviour */ + } + else + { + p_sci->send_message(sci, SCI_SETMARGINWIDTHN, 0, 0 ); + } +} + + +static void update_view(ScintillaObject *sci) +{ + ScintillaObject *current = p_document->get_current()->editor->sci; + gint lexer; + + update_font(sci, geany->interface_prefs->editor_font, 0); + + lexer = p_sci->send_message(current, SCI_GETLEXER, 0, 0); + p_sci->send_message(sci, SCI_SETLEXER, lexer, 0); + set_styles(current, sci); + + set_line_numbers(sci, TRUE, 0); + p_sci->send_message(sci, SCI_SETMARGINWIDTHN, 1, 0 ); /* hide marker margin */ +} + + +static void on_split_view(GtkMenuItem *menuitem, GeanyData *data) +{ + GtkWidget *notebook = data->main_widgets->notebook; + GtkWidget *parent = gtk_widget_get_parent(notebook); + GtkWidget *pane; + GeanyDocument *doc = p_document->get_current(); + ScintillaObject *sci; + gpointer sdoc; + + g_return_if_fail(doc); + g_return_if_fail(our_editor == NULL); + + /* reparent document notebook */ + g_object_ref(notebook); + gtk_container_remove(GTK_CONTAINER(parent), notebook); + pane = gtk_hpaned_new(); + gtk_container_add(GTK_CONTAINER(parent), pane); + gtk_paned_add1(GTK_PANED(pane), notebook); + g_object_unref(notebook); + + sci = doc->editor->sci; + sdoc = (gpointer) p_sci->send_message(sci, SCI_GETDOCPOINTER, 0, 0); + our_editor = p_editor->create(doc); + sci = our_editor->sci; + p_sci->send_message(sci, SCI_SETDOCPOINTER, 0, GPOINTER_TO_INT(sdoc)); + update_view(sci); + gtk_paned_add2(GTK_PANED(pane), GTK_WIDGET(sci)); + gtk_widget_show_all(pane); +} + + +void plugin_init(GeanyData *data) +{ + GtkWidget *item = gtk_menu_item_new_with_mnemonic(_("_Split Horizontally")); + + gtk_widget_show(item); + gtk_menu_append(data->main_widgets->tools_menu, item); + g_signal_connect(item, "activate", G_CALLBACK(on_split_view), data); +} + + +void plugin_cleanup() +{ + if (our_editor) + p_editor->destroy(our_editor); + /* TODO: reparent doc notebook etc */ +} Property changes on: branches/split-window-plugin/plugins/splitwindow.c ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: branches/split-window-plugin/po/POTFILES.in =================================================================== --- branches/split-window-plugin/po/POTFILES.in 2008-08-26 15:25:50 UTC (rev 2905) +++ branches/split-window-plugin/po/POTFILES.in 2008-08-26 15:58:07 UTC (rev 2906) @@ -42,3 +42,4 @@ plugins/vcdiff.c plugins/filebrowser.c plugins/autosave.c +plugins/splitwindow.c Modified: branches/split-window-plugin/src/plugindata.h =================================================================== --- branches/split-window-plugin/src/plugindata.h 2008-08-26 15:25:50 UTC (rev 2905) +++ branches/split-window-plugin/src/plugindata.h 2008-08-26 15:58:07 UTC (rev 2906) @@ -41,7 +41,7 @@ enum { /** The Application Programming Interface (API) version, incremented * whenever any plugin data types are modified or appended to. */ - GEANY_API_VERSION = 89, + GEANY_API_VERSION = 90, /** The Application Binary Interface (ABI) version, incremented whenever * existing fields in the plugin data types have to be changed or reordered. */ @@ -455,6 +455,8 @@ void (*clear_indicators) (struct GeanyEditor *editor); const struct GeanyIndentPrefs* (*get_indent_prefs)(struct GeanyEditor *editor); + struct GeanyEditor* (*create)(struct GeanyDocument *doc); + void (*destroy)(struct GeanyEditor *editor); /* Remember to convert any GeanyDocument or ScintillaObject pointers in any * appended functions to GeanyEditor pointers. */ } Modified: branches/split-window-plugin/src/plugins.c =================================================================== --- branches/split-window-plugin/src/plugins.c 2008-08-26 15:25:50 UTC (rev 2905) +++ branches/split-window-plugin/src/plugins.c 2008-08-26 15:58:07 UTC (rev 2906) @@ -115,7 +115,9 @@ &editor_set_indicator, &editor_set_indicator_on_line, &editor_clear_indicators, - &editor_get_indent_prefs + &editor_get_indent_prefs, + &editor_create, + &editor_destroy }; static ScintillaFuncs sci_funcs = { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

15 years, 3 months

SF.net SVN: geany:[2905] branches/split-window-plugin/

by ntrel＠users.sourceforge.net

Revision: 2905 http://geany.svn.sourceforge.net/geany/?rev=2905&view=rev Author: ntrel Date: 2008-08-26 15:25:50 +0000 (Tue, 26 Aug 2008) Log Message: ----------- Create branch to develop basic Split Window functionality in a plugin. Added Paths: ----------- branches/split-window-plugin/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

15 years, 3 months

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits August 2008