Commits September 2007

commits@lists.geany.org

3 participants
74 discussions

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

28 Sep '07

Revision: 1920 http://geany.svn.sourceforge.net/geany/?rev=1920&view=rev Author: ntrel Date: 2007-09-28 10:06:09 -0700 (Fri, 28 Sep 2007) Log Message: ----------- Fix a possible segfault with vStringPut() - backported from CTags 5.7. This appears to fix a segfault on Windows 2000 when loading tagmanager/c.c. Also adds vStringChop() - chop last character from string. Modified Paths: -------------- trunk/ChangeLog trunk/tagmanager/vstring.c trunk/tagmanager/vstring.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-09-28 16:32:28 UTC (rev 1919) +++ trunk/ChangeLog 2007-09-28 17:06:09 UTC (rev 1920) @@ -11,6 +11,11 @@ Add documentation for --no-preprocessing option. * src/keybindings.c: Add Project Properties menu accelerator. + * tagmanager/vstring.h, tagmanager/vstring.c: + Fix a possible segfault with vStringPut() - backported from CTags + 5.7. This appears to fix a segfault on Windows 2000 when loading + tagmanager/c.c. + It also adds vStringChop() - chop last character from string. 2007-09-27 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/tagmanager/vstring.c =================================================================== --- trunk/tagmanager/vstring.c 2007-09-28 16:32:28 UTC (rev 1919) +++ trunk/tagmanager/vstring.c 2007-09-28 17:06:09 UTC (rev 1920) @@ -1,6 +1,6 @@ /* * -* Copyright (c) 1998-2001, Darren Hiebert +* Copyright (c) 1998-2002, Darren Hiebert * * This source code is released for free distribution under the terms of the * GNU General Public License. @@ -58,7 +58,7 @@ { string->length = 0; string->buffer [0] = '\0'; - DebugStatement ( clearString (string->buffer, string->size); ) + DebugStatement ( memset (string->buffer, 0, string->size); ) } extern void vStringDelete (vString *const string) @@ -84,26 +84,35 @@ return string; } +#ifndef VSTRING_PUTC_MACRO extern void vStringPut (vString *const string, const int c) { - if (string->length == string->size) /* check for buffer overflow */ - vStringAutoResize (string); + if (string->length + 1 == string->size) /* check for buffer overflow */ + vStringAutoResize (string); string->buffer [string->length] = c; if (c != '\0') - string->length++; + string->buffer [++string->length] = '\0'; } +#endif extern void vStringCatS (vString *const string, const char *const s) { +#if 1 + const size_t len = strlen (s); + while (string->length + len + 1 >= string->size)/* check for buffer overflow */ + vStringAutoResize (string); + strcpy (string->buffer + string->length, s); + string->length += len; +#else const char *p = s; - do - vStringPut (string, *p); + vStringPut (string, *p); while (*p++ != '\0'); +#endif } -extern vString *vStringNewCopy (vString *const string) +extern vString *vStringNewCopy (const vString *const string) { vString *vs = vStringNew (); vStringCatS (vs, string->buffer); @@ -117,8 +126,8 @@ return vs; } -extern void vStringNCatS (vString *const string, const char *const s, - const size_t length) +extern void vStringNCatS ( + vString *const string, const char *const s, const size_t length) { const char *p = s; size_t remain = length; @@ -170,20 +179,31 @@ } } +/* Chop last character from string. + */ +extern void vStringChop (vString *const string) +{ + if (string->length > 0) + { + --string->length; + string->buffer [string->length] = '\0'; + } +} + extern void vStringCopyS (vString *const string, const char *const s) { vStringClear (string); vStringCatS (string, s); } -extern void vStringNCopyS (vString *const string, const char *const s, - const size_t length) +extern void vStringNCopyS ( + vString *const string, const char *const s, const size_t length) { vStringClear (string); vStringNCatS (string, s, length); } -extern void vStringCopyToLower (vString *const dest, vString *const src) +extern void vStringCopyToLower (vString *const dest, const vString *const src) { const size_t length = src->length; const char *s = src->buffer; @@ -207,4 +227,4 @@ string->length = strlen (string->buffer); } -/* vi:set tabstop=8 shiftwidth=4: */ +/* vi:set tabstop=4 shiftwidth=4: */ Modified: trunk/tagmanager/vstring.h =================================================================== --- trunk/tagmanager/vstring.h 2007-09-28 16:32:28 UTC (rev 1919) +++ trunk/tagmanager/vstring.h 2007-09-28 17:06:09 UTC (rev 1920) @@ -1,5 +1,5 @@ /* -* Copyright (c) 1998-2001, Darren Hiebert +* Copyright (c) 1998-2002, Darren Hiebert * * This source code is released for free distribution under the terms of the * GNU General Public License. @@ -21,6 +21,16 @@ /* * MACROS */ +#ifndef DEBUG +# define VSTRING_PUTC_MACRO 1 +#endif +#ifdef VSTRING_PUTC_MACRO +#define vStringPut(s,c) \ + (void)(((s)->length + 1 == (s)->size ? vStringAutoResize (s) : 0), \ + ((s)->buffer [(s)->length] = (c)), \ + ((c) == '\0' ? 0 : ((s)->buffer [++(s)->length] = '\0'))) +#endif + #define vStringValue(vs) ((vs)->buffer) #define vStringItem(vs,i) ((vs)->buffer[i]) #define vStringLength(vs) ((vs)->length) @@ -51,19 +61,22 @@ extern void vStringClear (vString *const string); extern vString *vStringNew (void); extern void vStringDelete (vString *const string); +#ifndef VSTRING_PUTC_MACRO extern void vStringPut (vString *const string, const int c); +#endif extern void vStringStripNewline (vString *const string); extern void vStringStripLeading (vString *const string); +extern void vStringChop (vString *const string); extern void vStringStripTrailing (vString *const string); extern void vStringCatS (vString *const string, const char *const s); extern void vStringNCatS (vString *const string, const char *const s, const size_t length); -extern vString *vStringNewCopy (vString *const string); +extern vString *vStringNewCopy (const vString *const string); extern vString *vStringNewInit (const char *const s); extern void vStringCopyS (vString *const string, const char *const s); extern void vStringNCopyS (vString *const string, const char *const s, const size_t length); -extern void vStringCopyToLower (vString *const dest, vString *const src); +extern void vStringCopyToLower (vString *const dest, const vString *const src); extern void vStringSetLength (vString *const string); #endif /* _VSTRING_H */ -/* vi:set tabstop=8 shiftwidth=4: */ +/* vi:set tabstop=4 shiftwidth=4: */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

28 Sep '07

Revision: 1919 http://geany.svn.sourceforge.net/geany/?rev=1919&view=rev Author: ntrel Date: 2007-09-28 09:32:28 -0700 (Fri, 28 Sep 2007) Log Message: ----------- Add Project Properties menu accelerator. Modified Paths: -------------- trunk/ChangeLog trunk/src/keybindings.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-09-28 15:43:01 UTC (rev 1918) +++ trunk/ChangeLog 2007-09-28 16:32:28 UTC (rev 1919) @@ -9,6 +9,8 @@ disable preprocessing of C/C++ source files. * doc/geany.txt, doc/geany.html, doc/geany.1.in, NEWS: Add documentation for --no-preprocessing option. + * src/keybindings.c: + Add Project Properties menu accelerator. 2007-09-27 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/src/keybindings.c =================================================================== --- trunk/src/keybindings.c 2007-09-28 15:43:01 UTC (rev 1918) +++ trunk/src/keybindings.c 2007-09-28 16:32:28 UTC (rev 1919) @@ -103,7 +103,7 @@ // common function for keybindings using current word static void cb_func_current_word(guint key_id); -static void keybindings_add_accels(); +static void add_menu_accels(); static void init_default_kb() @@ -370,7 +370,7 @@ keys[GEANY_KEYS_EDIT_TOGGLECASE]->section = _("Editing commands"); keys[GEANY_KEYS_EDIT_AUTOCOMPLETE]->section = _("Tag commands"); - keybindings_add_accels(); + add_menu_accels(); } @@ -388,7 +388,7 @@ "activate", accel_group, keys[(gkey)]->key, keys[(gkey)]->mods, \ GTK_ACCEL_VISIBLE) -static void keybindings_add_accels() +static void add_menu_accels() { GtkAccelGroup *accel_group = gtk_accel_group_new(); @@ -421,13 +421,18 @@ GEANY_ADD_ACCEL(GEANY_KEYS_MENU_FULLSCREEN, menu_fullscreen1); GEANY_ADD_ACCEL(GEANY_KEYS_MENU_MESSAGEWINDOW, menu_show_messages_window1); GEANY_ADD_ACCEL(GEANY_KEYS_MENU_SIDEBAR, menu_show_sidebar1); - GEANY_ADD_ACCEL(GEANY_KEYS_MENU_OPENCOLORCHOOSER, menu_choose_color1); GEANY_ADD_ACCEL(GEANY_KEYS_MENU_ZOOMIN, menu_zoom_in1); GEANY_ADD_ACCEL(GEANY_KEYS_MENU_ZOOMOUT, menu_zoom_out1); + GEANY_ADD_ACCEL(GEANY_KEYS_MENU_REPLACETABS, menu_replace_tabs); GEANY_ADD_ACCEL(GEANY_KEYS_MENU_FOLDALL, menu_fold_all1); GEANY_ADD_ACCEL(GEANY_KEYS_MENU_UNFOLDALL, menu_unfold_all1); + + GEANY_ADD_ACCEL(GEANY_KEYS_MENU_PROJECTPROPERTIES, project_properties1); + + GEANY_ADD_ACCEL(GEANY_KEYS_MENU_OPENCOLORCHOOSER, menu_choose_color1); //~ GEANY_ADD_ACCEL(GEANY_KEYS_MENU_INSERTSPECIALCHARS, menu_insert_special_chars1); + GEANY_ADD_ACCEL(GEANY_KEYS_EDIT_TOGGLECASE, menu_toggle_case2); GEANY_ADD_ACCEL(GEANY_KEYS_EDIT_COMMENTLINE, menu_comment_line1); GEANY_ADD_ACCEL(GEANY_KEYS_EDIT_UNCOMMENTLINE, menu_uncomment_line1); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

28 Sep '07

Revision: 1918 http://geany.svn.sourceforge.net/geany/?rev=1918&view=rev Author: ntrel Date: 2007-09-28 08:43:01 -0700 (Fri, 28 Sep 2007) Log Message: ----------- Add documentation for --no-preprocessing option. Modified Paths: -------------- trunk/ChangeLog trunk/NEWS trunk/doc/geany.1.in trunk/doc/geany.html trunk/doc/geany.txt Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-09-28 11:48:55 UTC (rev 1917) +++ trunk/ChangeLog 2007-09-28 15:43:01 UTC (rev 1918) @@ -7,6 +7,8 @@ * src/main.c, src/symbols.c, src/symbols.h: Add --no-preprocessing, -P option when generating tags files to disable preprocessing of C/C++ source files. + * doc/geany.txt, doc/geany.html, doc/geany.1.in, NEWS: + Add documentation for --no-preprocessing option. 2007-09-27 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/NEWS =================================================================== --- trunk/NEWS 2007-09-28 11:48:55 UTC (rev 1917) +++ trunk/NEWS 2007-09-28 15:43:01 UTC (rev 1918) @@ -51,6 +51,8 @@ * Added auto_complete_whilst_editing hidden preference. * Speed up Save All for C-like files. * Don't show file opened/saved/closed messages on the status bar. + * Added --no-preprocessing, -P option when generating tags files to + disable preprocessing of C/C++ source files. (Thanks also to Christoph Berg for updating the icon code). Docs: Modified: trunk/doc/geany.1.in =================================================================== --- trunk/doc/geany.1.in 2007-09-28 11:48:55 UTC (rev 1917) +++ trunk/doc/geany.1.in 2007-09-28 15:43:01 UTC (rev 1918) @@ -23,7 +23,9 @@ .IP "\fB\fP \fB\-\-ft\-names\fP " 10 Print a list of Geany's internal filetype names (useful for the auto completion list). .IP "\fB-g\fP \fB\-\-generate\-tags\fP " 10 -Generate global tags file (see documentation). +Generate a global tags file (see documentation). +.IP "\fB-P\fP \fB\-\-no\-preprocessing\fP " 10 +Don't preprocess C/C++ files when generating tags. .IP "\fB-i\fP \fB\-\-new-instance\fP " 10 Don't open files in a running instance, force opening a new instance. Only available if Geany was compiled with support for Sockets. Modified: trunk/doc/geany.html =================================================================== --- trunk/doc/geany.html 2007-09-28 11:48:55 UTC (rev 1917) +++ trunk/doc/geany.html 2007-09-28 15:43:01 UTC (rev 1918) @@ -420,8 +420,8 @@ <table border="1" class="docutils"> <colgroup> <col width="13%" /> -<col width="26%" /> -<col width="61%" /> +<col width="25%" /> +<col width="62%" /> </colgroup> <thead valign="bottom"> <tr><th class="head">Short option</th> @@ -437,7 +437,7 @@ <tr><td>-c dir_name</td> <td>--config=directory_name</td> <td>Use an alternate configuration directory. Default -configuration directory is ~/.geany/ and there resides +configuration directory is <tt class="docutils literal"><span class="pre">~/.geany/</span></tt> and there resides <tt class="docutils literal"><span class="pre">geany.conf</span></tt> and other configuration files.</td> </tr> <tr><td>-d</td> @@ -450,6 +450,15 @@ <td>Print a list of Geany's internal filetype names (useful for the auto completion list).</td> </tr> +<tr><td>-g</td> +<td>--generate-tags</td> +<td>Generate a global tags file (see +<a class="reference" href="#generating-a-global-tags-file">Generating a global tags file</a>).</td> +</tr> +<tr><td>-P</td> +<td>--no-preprocessing</td> +<td>Don't preprocess C/C++ files when generating tags.</td> +</tr> <tr><td>-i</td> <td>--new-instance</td> <td>Do not open files in a running instance, force opening @@ -482,7 +491,7 @@ <td>--no-terminal</td> <td>Do not load terminal support. Use this option if you do not want to load the virtual terminal emulator widget -at startup. If you do not have libvte.so.4 installed, +at startup. If you do not have <tt class="docutils literal"><span class="pre">libvte.so.4</span></tt> installed, then terminal-support is automatically disabled. Only available if Geany was compiled with support for VTE.</td> </tr> @@ -1150,7 +1159,7 @@ <p>You can generate your own global tags files by parsing a list of source files. The command is:</p> <pre class="literal-block"> -geany -g <Tag File> <File list> +geany -g [-P] <Tag File> <File list> </pre> <ul class="simple"> <li>Tag File should be in the format described earlier -- see the @@ -1158,6 +1167,11 @@ <li>File list is a list of filenames, each with a full path (unless you are generating C/C++ tags and have set the CFLAGS environment variable appropriately).</li> +<li><tt class="docutils literal"><span class="pre">-P</span></tt> or <tt class="docutils literal"><span class="pre">--no-preprocessing</span></tt> disables using the C pre-processor +to process <tt class="docutils literal"><span class="pre">#include</span></tt> directives for C/C++ source files. Use this +option if you want to specify each source file on the command-line +instead of using a 'master' header file. Also can be useful if you +don't want to specify the CFLAGS environment variable.</li> </ul> <p>Example for the wxD library for the D programming language:</p> <pre class="literal-block"> @@ -1183,8 +1197,6 @@ will be loaded instead of the default global.tags. You should keep a copy of the generated tags file because it will get overwritten when upgrading Geany.</p> -<p>This is a temporary solution -- in later versions this will be -unnecessary.</p> </div> </div> </div> @@ -3066,7 +3078,7 @@ <div class="footer"> <hr class="footer" /> <a class="reference" href="geany.txt">View document source</a>. -Generated on: 2007-09-13 16:43 UTC. +Generated on: 2007-09-28 15:47 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 2007-09-28 11:48:55 UTC (rev 1917) +++ trunk/doc/geany.txt 2007-09-28 15:43:01 UTC (rev 1918) @@ -180,7 +180,7 @@ *none* --column Set initial column number for the first opened file. -c dir_name --config=directory_name Use an alternate configuration directory. Default - configuration directory is ~/.geany/ and there resides + configuration directory is ``~/.geany/`` and there resides ``geany.conf`` and other configuration files. -d --debug Run Geany in debug mode, which means being verbose @@ -189,6 +189,11 @@ *none* --ft-names Print a list of Geany's internal filetype names (useful for the auto completion list). +-g --generate-tags Generate a global tags file (see + `Generating a global tags file`_). + +-P --no-preprocessing Don't preprocess C/C++ files when generating tags. + -i --new-instance Do not open files in a running instance, force opening a new instance. Only available if Geany was compiled with support for Sockets. @@ -207,7 +212,7 @@ -t --no-terminal Do not load terminal support. Use this option if you do not want to load the virtual terminal emulator widget - at startup. If you do not have libvte.so.4 installed, + at startup. If you do not have ``libvte.so.4`` installed, then terminal-support is automatically disabled. Only available if Geany was compiled with support for VTE. @@ -952,13 +957,18 @@ You can generate your own global tags files by parsing a list of source files. The command is:: - geany -g <Tag File> <File list> + geany -g [-P] <Tag File> <File list> * Tag File should be in the format described earlier -- see the section called `Global tags`_. * File list is a list of filenames, each with a full path (unless you are generating C/C++ tags and have set the CFLAGS environment variable appropriately). +* ``-P`` or ``--no-preprocessing`` disables using the C pre-processor + to process ``#include`` directives for C/C++ source files. Use this + option if you want to specify each source file on the command-line + instead of using a 'master' header file. Also can be useful if you + don't want to specify the CFLAGS environment variable. Example for the wxD library for the D programming language:: @@ -991,11 +1001,8 @@ copy of the generated tags file because it will get overwritten when upgrading Geany. -This is a temporary solution -- in later versions this will be -unnecessary. - Preferences ----------- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

28 Sep '07

Revision: 1917 http://geany.svn.sourceforge.net/geany/?rev=1917&view=rev Author: ntrel Date: 2007-09-28 04:48:55 -0700 (Fri, 28 Sep 2007) Log Message: ----------- Add --no-preprocessing, -P option when generating tags files to disable preprocessing of C/C++ source files. Modified Paths: -------------- trunk/ChangeLog trunk/src/main.c trunk/src/symbols.c trunk/src/symbols.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-09-28 10:54:56 UTC (rev 1916) +++ trunk/ChangeLog 2007-09-28 11:48:55 UTC (rev 1917) @@ -4,6 +4,9 @@ Also ignore Ctrl-L for VTE bash command. Allow 'Switch to editor' command to override any bash commands. Also disable the popup menu to avoid VTE bash conflicts. + * src/main.c, src/symbols.c, src/symbols.h: + Add --no-preprocessing, -P option when generating tags files to + disable preprocessing of C/C++ source files. 2007-09-27 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/src/main.c =================================================================== --- trunk/src/main.c 2007-09-28 10:54:56 UTC (rev 1916) +++ trunk/src/main.c 2007-09-28 11:48:55 UTC (rev 1917) @@ -104,6 +104,7 @@ #endif static gboolean generate_datafiles = FALSE; static gboolean generate_tags = FALSE; +static gboolean no_preprocessing = FALSE; static gboolean ft_names = FALSE; static gboolean no_plugins = FALSE; @@ -115,7 +116,8 @@ { "debug", 'd', 0, G_OPTION_ARG_NONE, &debug_mode, N_("Runs in debug mode (means being verbose)"), NULL }, { "ft-names", 0, 0, G_OPTION_ARG_NONE, &ft_names, N_("Print internal filetype names"), NULL }, { "generate-tags", 'g', 0, G_OPTION_ARG_NONE, &generate_tags, N_("Generate global tags file (see documentation)"), NULL }, - { "generate-data-files", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, &generate_datafiles, "", NULL }, + { "no-preprocessing", 'P', 0, G_OPTION_ARG_NONE, &no_preprocessing, NULL, NULL }, + { "generate-data-files", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, &generate_datafiles, NULL, NULL }, #ifdef HAVE_SOCKET { "new-instance", 'i', 0, G_OPTION_ARG_NONE, &ignore_socket, N_("Don't open files in a running instance, force opening a new instance"), NULL }, #endif @@ -458,7 +460,7 @@ filetypes_init_types(); configuration_read_filetype_extensions(); // needed for *.lang.tags filetype matching - ret = symbols_generate_global_tags(*argc, *argv); + ret = symbols_generate_global_tags(*argc, *argv, ! no_preprocessing); exit(ret); } Modified: trunk/src/symbols.c =================================================================== --- trunk/src/symbols.c 2007-09-28 10:54:56 UTC (rev 1916) +++ trunk/src/symbols.c 2007-09-28 11:48:55 UTC (rev 1917) @@ -857,7 +857,7 @@ * the relevant path. * Example: * CFLAGS=-I/home/user/libname-1.x geany -g libname.d.tags libname.h */ -int symbols_generate_global_tags(int argc, char **argv) +int symbols_generate_global_tags(int argc, char **argv, gboolean want_preprocess) { /* -E pre-process, -dD output user macros, -p prof info (?), * -undef remove builtin macros (seems to be needed with FC5 gcc 4.1.1 */ @@ -881,7 +881,7 @@ g_printerr(_("Unknown filetype extension for \"%s\".\n"), tags_file); return 1; } - if (ft->lang == 0 || ft->lang == 1) /* C/C++ */ + if (want_preprocess && (ft->id == GEANY_FILETYPES_C || ft->id == GEANY_FILETYPES_CPP)) command = g_strdup_printf("%s %s", pre_process, NVL(getenv("CFLAGS"), "")); else command = NULL; // don't preprocess Modified: trunk/src/symbols.h =================================================================== --- trunk/src/symbols.h 2007-09-28 10:54:56 UTC (rev 1916) +++ trunk/src/symbols.h 2007-09-28 11:48:55 UTC (rev 1917) @@ -44,7 +44,7 @@ gboolean symbols_recreate_tag_list(gint idx, gboolean sort_by_name); -gint symbols_generate_global_tags(gint argc, gchar **argv); +gint symbols_generate_global_tags(gint argc, gchar **argv, gboolean want_preprocess); void symbols_show_load_tags_dialog(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

28 Sep '07

Revision: 1916 http://geany.svn.sourceforge.net/geany/?rev=1916&view=rev Author: ntrel Date: 2007-09-28 03:54:56 -0700 (Fri, 28 Sep 2007) Log Message: ----------- Also ignore Ctrl-L for VTE bash command. Allow 'Switch to editor' command to override any bash commands. Also disable the popup menu to avoid VTE bash conflicts. Modified Paths: -------------- trunk/ChangeLog trunk/src/keybindings.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-09-27 15:10:22 UTC (rev 1915) +++ trunk/ChangeLog 2007-09-28 10:54:56 UTC (rev 1916) @@ -1,3 +1,11 @@ +2007-09-28 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/keybindings.c: + Also ignore Ctrl-L for VTE bash command. + Allow 'Switch to editor' command to override any bash commands. + Also disable the popup menu to avoid VTE bash conflicts. + + 2007-09-27 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * src/keyfile.c: Modified: trunk/src/keybindings.c =================================================================== --- trunk/src/keybindings.c 2007-09-27 15:10:22 UTC (rev 1915) +++ trunk/src/keybindings.c 2007-09-28 10:54:56 UTC (rev 1916) @@ -680,7 +680,7 @@ #ifndef HAVE_VTE return FALSE; #else - GtkWidget *menubar; + GtkWidget *widget; if (! vte_info.have_vte) return FALSE; @@ -699,6 +699,7 @@ case GDK_c: case GDK_d: case GDK_e: + case GDK_l: case GDK_k: case GDK_q: case GDK_r: @@ -710,12 +711,20 @@ default: return FALSE; } - /* Temporarily disable the menubar to prevent conflicting menu accelerators. + if (event->state == keys[GEANY_KEYS_SWITCH_EDITOR]->mods && + keyval == keys[GEANY_KEYS_SWITCH_EDITOR]->key) + return FALSE; // make switch to editor override any bash commands + + /* Temporarily disable the menus to prevent conflicting menu accelerators + * from overriding the VTE bash shortcuts. * Ideally we would just somehow disable the menubar without redrawing it, * but maybe that's not possible. */ - menubar = lookup_widget(app->window, "menubar1"); - gtk_widget_set_sensitive(menubar, FALSE); - g_idle_add(&set_sensitive, (gpointer) menubar); + widget = lookup_widget(app->window, "menubar1"); + gtk_widget_set_sensitive(widget, FALSE); + g_idle_add(&set_sensitive, (gpointer) widget); + widget = app->popup_menu; + gtk_widget_set_sensitive(widget, FALSE); + g_idle_add(&set_sensitive, (gpointer) widget); return TRUE; #endif } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1915] trunk
by ntrel＠users.sourceforge.net 27 Sep '07

27 Sep '07

Revision: 1915 http://geany.svn.sourceforge.net/geany/?rev=1915&view=rev Author: ntrel Date: 2007-09-27 08:10:22 -0700 (Thu, 27 Sep 2007) Log Message: ----------- Fix displaying error indicators with Make after entering a subdirectory. Modified Paths: -------------- trunk/ChangeLog trunk/NEWS trunk/src/build.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-09-27 15:09:54 UTC (rev 1914) +++ trunk/ChangeLog 2007-09-27 15:10:22 UTC (rev 1915) @@ -13,6 +13,11 @@ Don't show file opened/saved/closed messages on the status bar. Add temporary function msgwin_status_add_new() for v0.12 (to avoid many code changes updating msgwin_status_add() before the release). + * src/utils.h, src/keyfile.c: + Fix possible conflict of 'tmp' variable name in setptr macro. + * src/build.c, NEWS: + Fix displaying error indicators with Make after entering a + subdirectory. 2007-09-26 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/NEWS =================================================================== --- trunk/NEWS 2007-09-27 15:09:54 UTC (rev 1914) +++ trunk/NEWS 2007-09-27 15:10:22 UTC (rev 1915) @@ -9,6 +9,8 @@ * Fixed replacing with '^' or '$' regex chars. * Fixed hang with Find All/Find Usage with '^' or '$' regex chars. * Fixed hang when replacing all '[ ]*' regex matches (closes #1757748). + * Fixed displaying error indicators with Make after entering a + subdirectory. Filetypes: * Added reStructuredText filetype and parser. Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2007-09-27 15:09:54 UTC (rev 1914) +++ trunk/src/build.c 2007-09-27 15:10:22 UTC (rev 1915) @@ -57,6 +57,8 @@ BuildInfo build_info = {GBO_COMPILE, 0, NULL, GEANY_FILETYPES_ALL, NULL}; +static gchar *current_dir_entered = NULL; + static struct { GPid pid; @@ -471,6 +473,7 @@ g_return_val_if_fail(DOC_IDX_VALID(idx), (GPid) 1); clear_errors(idx); + setptr(current_dir_entered, NULL); locale_filename = utils_get_locale_from_utf8(doc_list[idx].file_name); executable = utils_remove_ext_from_filename(locale_filename); @@ -796,7 +799,7 @@ if (cond & (G_IO_IN | G_IO_PRI)) { //GIOStatus s; - gchar *msg, *dir = NULL; + gchar *msg; while (g_io_channel_read_line(ioc, &msg, NULL, NULL, NULL) && msg) { @@ -809,9 +812,7 @@ if (build_parse_make_dir(msg, &tmp)) { - if (dir != NULL) - g_free(dir); - dir = tmp; + setptr(current_dir_entered, tmp); } if (editor_prefs.use_indicators) @@ -819,10 +820,12 @@ gchar *filename; gint line; - msgwin_parse_compiler_error_line(msg, dir, &filename, &line); + msgwin_parse_compiler_error_line(msg, current_dir_entered, + &filename, &line); if (line != -1 && filename != NULL) { gint idx = document_find_by_filename(filename, FALSE); + document_set_indicator(idx, line - 1); // will check valid idx color = COLOR_RED; // error message parsed on the line } @@ -832,9 +835,6 @@ g_free(msg); } - - if (dir != NULL) - g_free(dir); } if (cond & (G_IO_ERR | G_IO_HUP | G_IO_NVAL)) return FALSE; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1914] trunk/src
by ntrel＠users.sourceforge.net 27 Sep '07

27 Sep '07

Revision: 1914 http://geany.svn.sourceforge.net/geany/?rev=1914&view=rev Author: ntrel Date: 2007-09-27 08:09:54 -0700 (Thu, 27 Sep 2007) Log Message: ----------- Fix possible conflict of 'tmp' variable name in setptr macro. Modified Paths: -------------- trunk/src/keyfile.c trunk/src/utils.h Modified: trunk/src/keyfile.c =================================================================== --- trunk/src/keyfile.c 2007-09-27 11:39:21 UTC (rev 1913) +++ trunk/src/keyfile.c 2007-09-27 15:09:54 UTC (rev 1914) @@ -624,7 +624,7 @@ { if (ui_prefs.geometry[i] < -1) ui_prefs.geometry[i] = -1; - } + } } hpan_position = utils_get_setting_integer(config, PACKAGE, "treeview_position", 156); vpan_position = utils_get_setting_integer(config, PACKAGE, "msgwindow_position", (geo) ? Modified: trunk/src/utils.h =================================================================== --- trunk/src/utils.h 2007-09-27 11:39:21 UTC (rev 1913) +++ trunk/src/utils.h 2007-09-27 15:09:54 UTC (rev 1914) @@ -34,9 +34,9 @@ * It prevents a memory leak compared with: ptr = func(ptr); */ #define setptr(ptr, result)\ {\ - gpointer tmp = ptr;\ + gpointer setptr_tmp = ptr;\ ptr = result;\ - g_free(tmp);\ + g_free(setptr_tmp);\ } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1913] trunk
by ntrel＠users.sourceforge.net 27 Sep '07

27 Sep '07

Revision: 1913 http://geany.svn.sourceforge.net/geany/?rev=1913&view=rev Author: ntrel Date: 2007-09-27 04:39:21 -0700 (Thu, 27 Sep 2007) Log Message: ----------- Don't show file opened/saved/closed messages on the status bar. Add temporary function msgwin_status_add_new() for v0.12 (to avoid many code changes updating msgwin_status_add() before the release). Modified Paths: -------------- trunk/ChangeLog trunk/NEWS trunk/src/document.c trunk/src/msgwindow.c trunk/src/plugins.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-09-27 11:29:54 UTC (rev 1912) +++ trunk/ChangeLog 2007-09-27 11:39:21 UTC (rev 1913) @@ -9,6 +9,10 @@ * src/keybindings.c: Add enable_vte_bash_keys keybindings.conf hidden pref in [Settings]. Refactor keybindings_init(). + * src/msgwindow.c, src/document.c, src/plugins.c, NEWS: + Don't show file opened/saved/closed messages on the status bar. + Add temporary function msgwin_status_add_new() for v0.12 (to avoid + many code changes updating msgwin_status_add() before the release). 2007-09-26 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/NEWS =================================================================== --- trunk/NEWS 2007-09-27 11:29:54 UTC (rev 1912) +++ trunk/NEWS 2007-09-27 11:39:21 UTC (rev 1913) @@ -48,7 +48,8 @@ * Added hidden editor preference 'use_gtk_word_boundaries'. * Added auto_complete_whilst_editing hidden preference. * Speed up Save All for C-like files. - Thanks also to Christoph Berg for updating the main window icon. + * Don't show file opened/saved/closed messages on the status bar. + (Thanks also to Christoph Berg for updating the icon code). Docs: * Added Plugins section. Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2007-09-27 11:29:54 UTC (rev 1912) +++ trunk/src/document.c 2007-09-27 11:39:21 UTC (rev 1913) @@ -80,6 +80,8 @@ static gboolean delay_colourise = FALSE; +void msgwin_status_add_new(const gchar *format, ...) G_GNUC_PRINTF(1, 2); // temporary for v0.12 + static void document_undo_clear(gint idx); static void document_redo_add(gint idx, guint type, gpointer data); @@ -464,7 +466,7 @@ } notebook_remove_page(page_num); treeviews_remove_document(idx); - msgwin_status_add(_("File %s closed."), DOC_FILENAME(idx)); + msgwin_status_add_new(_("File %s closed."), DOC_FILENAME(idx)); g_free(doc_list[idx].encoding); g_free(doc_list[idx].saved_encoding.encoding); g_free(doc_list[idx].file_name); @@ -562,7 +564,7 @@ g_signal_emit_by_name(geany_object, "document-new", idx); } - msgwin_status_add(_("New file \"%s\" opened."), + msgwin_status_add_new(_("New file \"%s\" opened."), (doc_list[idx].file_name != NULL) ? doc_list[idx].file_name : GEANY_STRING_UNTITLED); return idx; @@ -962,7 +964,7 @@ if (reload) msgwin_status_add(_("File %s reloaded."), utf8_filename); else - msgwin_status_add(_("File %s opened(%d%s)."), + msgwin_status_add_new(_("File %s opened(%d%s)."), utf8_filename, gtk_notebook_get_n_pages(GTK_NOTEBOOK(app->notebook)), (readonly) ? _(", read-only") : ""); @@ -1218,7 +1220,7 @@ tm_workspace_update(TM_WORK_OBJECT(app->tm_workspace), TRUE, TRUE, FALSE); gtk_label_set_text(GTK_LABEL(doc_list[idx].tab_label), base_name); gtk_label_set_text(GTK_LABEL(doc_list[idx].tabmenu_label), base_name); - msgwin_status_add(_("File %s saved."), doc_list[idx].file_name); + msgwin_status_add_new(_("File %s saved."), doc_list[idx].file_name); ui_update_statusbar(idx, -1); g_free(base_name); #ifdef HAVE_VTE Modified: trunk/src/msgwindow.c =================================================================== --- trunk/src/msgwindow.c 2007-09-27 11:29:54 UTC (rev 1912) +++ trunk/src/msgwindow.c 2007-09-27 11:39:21 UTC (rev 1913) @@ -290,6 +290,27 @@ } +/* Log a status message *without* setting the status bar. + * This is a temporary function for the plugin API for Geany 0.12. + * In future, msgwin_status_add() will act like this. */ +void msgwin_status_add_new(const gchar *format, ...) +{ + gchar string[512]; + va_list args; + gboolean suppress; + + va_start(args, format); + g_vsnprintf(string, 512, format, args); + va_end(args); + + // hack to prevent setting the status bar + suppress = prefs.suppress_status_messages; + prefs.suppress_status_messages = TRUE; + msgwin_status_add("%s", string); + prefs.suppress_status_messages = suppress; +} + + // logs a status message (use ui_set_statusbar() to just display text on the statusbar) void msgwin_status_add(const gchar *format, ...) { Modified: trunk/src/plugins.c =================================================================== --- trunk/src/plugins.c 2007-09-27 11:29:54 UTC (rev 1912) +++ trunk/src/plugins.c 2007-09-27 11:39:21 UTC (rev 1913) @@ -168,27 +168,10 @@ }; -/* This is a temporary function for the plugin API for Geany 0.12. - * In future, msgwin_status_add() will act like this. */ -static void plugin_msgwin_status_add(const gchar *format, ...) -{ - gchar string[512]; - va_list args; - gboolean suppress; +void msgwin_status_add_new(const gchar *format, ...) G_GNUC_PRINTF(1, 2); // temporary for v0.12 - va_start(args, format); - g_vsnprintf(string, 512, format, args); - va_end(args); - - // hack to prevent setting the status bar - suppress = prefs.suppress_status_messages; - prefs.suppress_status_messages = TRUE; - msgwin_status_add("%s", string); - prefs.suppress_status_messages = suppress; -} - static MsgWinFuncs msgwin_funcs = { - &plugin_msgwin_status_add, + &msgwin_status_add_new, &msgwin_compiler_add_fmt }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1912] trunk
by eht16＠users.sourceforge.net 27 Sep '07

27 Sep '07

Revision: 1912 http://geany.svn.sourceforge.net/geany/?rev=1912&view=rev Author: eht16 Date: 2007-09-27 04:29:54 -0700 (Thu, 27 Sep 2007) Log Message: ----------- Don't load invalid window geometry data from the config file. Modified Paths: -------------- trunk/ChangeLog trunk/src/keyfile.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-09-27 11:13:59 UTC (rev 1911) +++ trunk/ChangeLog 2007-09-27 11:29:54 UTC (rev 1912) @@ -1,3 +1,9 @@ +2007-09-27 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/keyfile.c: + Don't load invalid window geometry data from the config file. + + 2007-09-27 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * src/keybindings.c: Modified: trunk/src/keyfile.c =================================================================== --- trunk/src/keyfile.c 2007-09-27 11:13:59 UTC (rev 1911) +++ trunk/src/keyfile.c 2007-09-27 11:29:54 UTC (rev 1912) @@ -611,11 +611,20 @@ } else { + gint i; + ui_prefs.geometry[0] = geo[0]; ui_prefs.geometry[1] = geo[1]; ui_prefs.geometry[2] = geo[2]; ui_prefs.geometry[3] = geo[3]; ui_prefs.geometry[4] = geo[4]; + + // don't use insane values + for (i = 0; i < 4; i++) + { + if (ui_prefs.geometry[i] < -1) + ui_prefs.geometry[i] = -1; + } } hpan_position = utils_get_setting_integer(config, PACKAGE, "treeview_position", 156); vpan_position = utils_get_setting_integer(config, PACKAGE, "msgwindow_position", (geo) ? This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1911] trunk
by ntrel＠users.sourceforge.net 27 Sep '07

27 Sep '07

Revision: 1911 http://geany.svn.sourceforge.net/geany/?rev=1911&view=rev Author: ntrel Date: 2007-09-27 04:13:59 -0700 (Thu, 27 Sep 2007) Log Message: ----------- Add enable_vte_bash_keys keybindings.conf hidden pref in [Settings]. Refactor keybindings_init(). Modified Paths: -------------- trunk/ChangeLog trunk/src/keybindings.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-09-26 19:56:45 UTC (rev 1910) +++ trunk/ChangeLog 2007-09-27 11:13:59 UTC (rev 1911) @@ -1,3 +1,10 @@ +2007-09-27 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/keybindings.c: + Add enable_vte_bash_keys keybindings.conf hidden pref in [Settings]. + Refactor keybindings_init(). + + 2007-09-26 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * src/keybindings.c: Modified: trunk/src/keybindings.c =================================================================== --- trunk/src/keybindings.c 2007-09-26 19:56:45 UTC (rev 1910) +++ trunk/src/keybindings.c 2007-09-27 11:13:59 UTC (rev 1911) @@ -46,7 +46,8 @@ #include "vte.h" -const gboolean swap_alt_tab_order = FALSE; +static const gboolean swap_alt_tab_order = FALSE; +static gboolean enable_vte_bash_keys; /* simple convenience function to allocate and fill the struct */ @@ -105,15 +106,8 @@ static void keybindings_add_accels(); -void keybindings_init(void) +static void init_default_kb() { - gchar *configfile = g_strconcat(app->configdir, G_DIR_SEPARATOR_S, "keybindings.conf", NULL); - gchar *val; - guint i; - guint key; - GdkModifierType mods; - GKeyFile *config = g_key_file_new(); - // init all fields of keys with default values keys[GEANY_KEYS_MENU_NEW] = fill(cb_func_file_action, GDK_n, GDK_CONTROL_MASK, "menu_new", _("New")); @@ -324,7 +318,18 @@ 0, 0, "popup_gototagdeclaration", _("Go to Tag Declaration")); keys[GEANY_KEYS_POPUP_CONTEXTACTION] = fill(cb_func_current_word, 0, 0, "popup_contextaction", _("Context Action")); +} + +static void load_user_kb() +{ + gchar *configfile = g_strconcat(app->configdir, G_DIR_SEPARATOR_S, "keybindings.conf", NULL); + gchar *val; + guint i; + guint key; + GdkModifierType mods; + GKeyFile *config = g_key_file_new(); + // now load user defined keys if (g_key_file_load_from_file(config, configfile, G_KEY_FILE_KEEP_COMMENTS, NULL)) { @@ -340,7 +345,18 @@ g_free(val); } } + enable_vte_bash_keys = + utils_get_setting_boolean(config, "Settings", "enable_vte_bash_keys", TRUE); + g_free(configfile); + g_key_file_free(config); +} + +void keybindings_init(void) +{ + init_default_kb(); + load_user_kb(); + // set section name keys[GEANY_KEYS_MENU_NEW]->section = _("File menu"); keys[GEANY_KEYS_MENU_UNDO]->section = _("Edit menu"); @@ -354,9 +370,6 @@ keys[GEANY_KEYS_EDIT_TOGGLECASE]->section = _("Editing commands"); keys[GEANY_KEYS_EDIT_AUTOCOMPLETE]->section = _("Tag commands"); - g_free(configfile); - g_key_file_free(config); - keybindings_add_accels(); } @@ -728,7 +741,7 @@ event->state -= GDK_MOD2_MASK; // special cases - if (check_vte(event, keyval)) + if (enable_vte_bash_keys && check_vte(event, keyval)) return FALSE; if (check_construct_completion(event)) return TRUE; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits September 2007