Commits October 2006

commits@lists.geany.org

2 participants
93 discussions

SF.net SVN: geany: [889] trunk/tagmanager
by ntrel＠users.sourceforge.net 12 Oct '06

12 Oct '06

Revision: 889 http://svn.sourceforge.net/geany/?rev=889&view=rev Author: ntrel Date: 2006-10-12 09:25:53 -0700 (Thu, 12 Oct 2006) Log Message: ----------- Backported tm_get_current_function() from Anjuta Modified Paths: -------------- trunk/tagmanager/include/tm_workspace.h trunk/tagmanager/tm_workspace.c Modified: trunk/tagmanager/include/tm_workspace.h =================================================================== --- trunk/tagmanager/include/tm_workspace.h 2006-10-12 16:25:11 UTC (rev 888) +++ trunk/tagmanager/include/tm_workspace.h 2006-10-12 16:25:53 UTC (rev 889) @@ -138,6 +138,12 @@ const GPtrArray *tm_workspace_find(const char *name, int type, TMTagAttrType *attrs , gboolean partial, langType lang); +/*! Returns TMTag to function which "own" given line + \param line Current line in edited file. + \param file_tags A GPtrArray of edited file TMTag pointers. + \return TMTag pointers to owner function. */ +const TMTag *tm_get_current_function(GPtrArray *file_tags, const gulong line); + /*! Returns a list of parent classes for the given class name \param name Name of the class \return A GPtrArray of TMTag pointers (includes the TMTag for the class) */ Modified: trunk/tagmanager/tm_workspace.c =================================================================== --- trunk/tagmanager/tm_workspace.c 2006-10-12 16:25:11 UTC (rev 888) +++ trunk/tagmanager/tm_workspace.c 2006-10-12 16:25:53 UTC (rev 889) @@ -526,6 +526,34 @@ } +const TMTag * +tm_get_current_function (GPtrArray * file_tags, const gulong line) +{ + GPtrArray *const local = tm_tags_extract (file_tags, tm_tag_function_t); + if (local && local->len) + { + guint i; + TMTag *tag, *function_tag = NULL; + gulong function_line = 0; + glong delta; + + for (i = 0; (i < local->len); ++i) + { + tag = TM_TAG (local->pdata[i]); + delta = line - tag->atts.entry.line; + if (delta >= 0 && (gulong)delta < line - function_line) + { + function_tag = tag; + function_line = tag->atts.entry.line; + } + } + g_ptr_array_free (local, TRUE); + return function_tag; + } + return NULL; +}; + + const GPtrArray *tm_workspace_get_parents(const gchar *name) { static TMTagAttrType type[] = { tm_tag_attr_name_t, tm_tag_attr_none_t }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [888] trunk/src/keyfile.c
by ntrel＠users.sourceforge.net 12 Oct '06

12 Oct '06

Revision: 888 http://svn.sourceforge.net/geany/?rev=888&view=rev Author: ntrel Date: 2006-10-12 09:25:11 -0700 (Thu, 12 Oct 2006) Log Message: ----------- Small fix for sign warning Modified Paths: -------------- trunk/src/keyfile.c Modified: trunk/src/keyfile.c =================================================================== --- trunk/src/keyfile.c 2006-10-12 16:24:34 UTC (rev 887) +++ trunk/src/keyfile.c 2006-10-12 16:25:11 UTC (rev 888) @@ -524,7 +524,7 @@ if (app->tab_order_ltr) { i++; - if (i >= session_files->len) break; + if (i >= (gint)session_files->len) break; } else { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [887] trunk/src
by ntrel＠users.sourceforge.net 12 Oct '06

12 Oct '06

Revision: 887 http://svn.sourceforge.net/geany/?rev=887&view=rev Author: ntrel Date: 2006-10-12 09:24:34 -0700 (Thu, 12 Oct 2006) Log Message: ----------- Added sci_get_last_child(), sci_get_fold_parent(). Modified Paths: -------------- trunk/src/sciwrappers.c trunk/src/sciwrappers.h Modified: trunk/src/sciwrappers.c =================================================================== --- trunk/src/sciwrappers.c 2006-10-12 10:45:49 UTC (rev 886) +++ trunk/src/sciwrappers.c 2006-10-12 16:24:34 UTC (rev 887) @@ -533,6 +533,20 @@ } +/* Get the next line after start_line with fold level <= level */ +gint sci_get_last_child(ScintillaObject* sci, gint start_line, gint level) +{ + return SSM( sci, SCI_GETLASTCHILD, start_line, level); +} + + +/* Get the line number of the fold point before start_line, or -1 if there isn't one */ +gint sci_get_fold_parent(ScintillaObject* sci, gint start_line) +{ + return SSM( sci, SCI_GETFOLDPARENT, start_line, 0); +} + + void sci_toggle_fold(ScintillaObject* sci, gint line) { SSM( sci, SCI_TOGGLEFOLD, line, 1); Modified: trunk/src/sciwrappers.h =================================================================== --- trunk/src/sciwrappers.h 2006-10-12 10:45:49 UTC (rev 886) +++ trunk/src/sciwrappers.h 2006-10-12 16:24:34 UTC (rev 887) @@ -32,6 +32,8 @@ void sci_set_line_numbers (ScintillaObject* sci, gboolean set, gint extra_width); void sci_set_mark_long_lines (ScintillaObject* sci, gint type, gint column, const gchar *color); +gboolean sci_get_line_numbers (ScintillaObject * sci); + void sci_set_text (ScintillaObject* sci, const gchar* text); void sci_add_text (ScintillaObject* sci, const gchar* text); void sci_add_text_buffer (ScintillaObject* sci, const gchar* text, gint len); @@ -98,14 +100,14 @@ gboolean sci_get_line_is_visible (ScintillaObject* sci, gint line); void sci_ensure_line_is_visible (ScintillaObject* sci, gint line); gint sci_get_fold_level (ScintillaObject* sci, gint line); +gint sci_get_last_child (ScintillaObject* sci, gint start_line, gint level); +gint sci_get_fold_parent (ScintillaObject* sci, gint start_line); void sci_set_folding_margin_visible (ScintillaObject * sci, gboolean set ); gboolean sci_get_folding_margin_visible(ScintillaObject * sci); gboolean sci_get_fold_expanded (ScintillaObject* sci, gint line); + void sci_colourise (ScintillaObject* sci, gint start, gint end); - -gboolean sci_get_line_numbers (ScintillaObject * sci); - void sci_set_lexer (ScintillaObject * sci, gint lexer); void sci_clear_all (ScintillaObject * sci); gint sci_get_end_styled (ScintillaObject * sci); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [886] trunk/tagmanager/diff.c
by eht16＠users.sourceforge.net 12 Oct '06

12 Oct '06

Revision: 886 http://svn.sourceforge.net/geany/?rev=886&view=rev Author: eht16 Date: 2006-10-12 03:45:49 -0700 (Thu, 12 Oct 2006) Log Message: ----------- Fixed compiler warnings. Modified Paths: -------------- trunk/tagmanager/diff.c Modified: trunk/tagmanager/diff.c =================================================================== --- trunk/tagmanager/diff.c 2006-10-11 22:15:26 UTC (rev 885) +++ trunk/tagmanager/diff.c 2006-10-12 10:45:49 UTC (rev 886) @@ -50,13 +50,13 @@ cp += 4; if (isspace ((int) *cp)) continue; - tmp = strrchr(cp, '/'); + tmp = (const unsigned char*) strrchr((const char*) cp, '/'); if (tmp == NULL) { // if no / is contained try \ in case of a Windows filename - tmp = strrchr(cp, '\\'); + tmp = (const unsigned char*) strrchr((const char*) cp, '\\'); if (tmp == NULL) { // last fallback, probably the filename doesn't contain a path, so take it - if (strlen(cp) > 0) + if (strlen((const char*) cp) > 0) { tmp = cp; skipSlash = 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: [885] trunk
by eht16＠users.sourceforge.net 12 Oct '06

12 Oct '06

Revision: 885 http://svn.sourceforge.net/geany/?rev=885&view=rev Author: eht16 Date: 2006-10-11 15:15:26 -0700 (Wed, 11 Oct 2006) Log Message: ----------- Updated missing keybindings. Modified Paths: -------------- trunk/ChangeLog trunk/doc/geany.docbook Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-10-11 22:01:26 UTC (rev 884) +++ trunk/ChangeLog 2006-10-11 22:15:26 UTC (rev 885) @@ -9,9 +9,9 @@ * src/sci_wrappers.c: Added sci_find_bracematch(). * src/keybindings.c: Added keyboard shortcut Ctrl+< to jump between matching braces(closes #1571283). + * doc/geany.docbook: Updated missing keybindings. - 2006-10-10 Enrico Tröger <enrico.troeger(a)uvena.de> * src/document.c: Connect only once to the "sci-notify" signal. Modified: trunk/doc/geany.docbook =================================================================== --- trunk/doc/geany.docbook 2006-10-11 22:01:26 UTC (rev 884) +++ trunk/doc/geany.docbook 2006-10-11 22:15:26 UTC (rev 885) @@ -1192,6 +1192,31 @@ <entry>Comments current line or selection.</entry> </row> <row> + <entry>Uncomment line</entry> + <entry>Uncomments current line or selection.</entry> + </row> + <row> + <entry>Toggle line commentation</entry> + <entry>Comments a line if it is not commented or removes a comment + if the line is commented.</entry> + </row> + <row> + <entry>Increase indent</entry> + <entry>Indents the current line or selection by one tabulator.</entry> + </row> + <row> + <entry>Decrease indent</entry> + <entry>Removes one tabulator from the indentation of the current + line or selection.</entry> + </row> + <row> + <entry>Goto matching brace</entry> + <entry>If the cursor is ahead or behind a brace, then it is moved to + the brace which belongs to the current one. If this keyboard + shortcut is pressed again, the cursor is moved back to the + first brace.</entry> + </row> + <row> <entry>Complete word</entry> <entry>Shows auto completion list.</entry> </row> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

12 Oct '06

Revision: 884 http://svn.sourceforge.net/geany/?rev=884&view=rev Author: eht16 Date: 2006-10-11 15:01:26 -0700 (Wed, 11 Oct 2006) Log Message: ----------- Added keyboard shortcut Ctrl+< to jump between matching braces(closes #1571283). Modified Paths: -------------- trunk/ChangeLog trunk/src/keybindings.c trunk/src/keybindings.h trunk/src/sciwrappers.c trunk/src/sciwrappers.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-10-11 19:45:40 UTC (rev 883) +++ trunk/ChangeLog 2006-10-11 22:01:26 UTC (rev 884) @@ -6,6 +6,9 @@ tagmanager/parsers.h, tagmanager/diff.c, src/filetypes.c, src/treeviews.c: Added simple parser for filetype Diff to create tags for each patched file in a diff file. + * src/sci_wrappers.c: Added sci_find_bracematch(). + * src/keybindings.c: Added keyboard shortcut Ctrl+< to jump between + matching braces(closes #1571283). Modified: trunk/src/keybindings.c =================================================================== --- trunk/src/keybindings.c 2006-10-11 19:45:40 UTC (rev 883) +++ trunk/src/keybindings.c 2006-10-11 22:01:26 UTC (rev 884) @@ -92,6 +92,7 @@ static void cb_func_edit_commentlinetoggle(void); static void cb_func_edit_uncommentline(void); static void cb_func_edit_increaseindent(void); +static void cb_func_edit_gotomatchingbrace(void); static void cb_func_edit_decreaseindent(void); static void cb_func_edit_autocomplete(void); static void cb_func_edit_calltip(void); @@ -214,6 +215,8 @@ GDK_i, GDK_CONTROL_MASK, "edit_increaseindent", _("Increase indent")); keys[GEANY_KEYS_EDIT_DECREASEINDENT] = fill(cb_func_edit_decreaseindent, GDK_i, GDK_SHIFT_MASK | GDK_CONTROL_MASK, "edit_decreaseindent", _("Decrease indent")); + keys[GEANY_KEYS_EDIT_GOTOMATCHINGBRACE] = fill(cb_func_edit_gotomatchingbrace, + GDK_less, GDK_CONTROL_MASK, "edit_gotomatchingbrace", _("Goto matching brace")); keys[GEANY_KEYS_EDIT_AUTOCOMPLETE] = fill(cb_func_edit_autocomplete, GDK_space, GDK_CONTROL_MASK, "edit_autocomplete", _("Complete word")); #ifdef G_OS_WIN32 @@ -796,6 +799,26 @@ on_menu_decrease_indent1_activate(NULL, NULL); } +static void cb_func_edit_gotomatchingbrace(void) +{ + gint pos, new_pos; + gint idx = document_get_cur_idx(); + + if (! DOC_IDX_VALID(idx)) return; + + pos = sci_get_current_position(doc_list[idx].sci); + if (! utils_isbrace(sci_get_char_at(doc_list[idx].sci, pos))) + pos--; // set pos to the brace + + new_pos = sci_find_bracematch(doc_list[idx].sci, pos); + if (new_pos != -1) + { + gint line = sci_get_line_from_position(doc_list[idx].sci, new_pos); + sci_goto_line_scroll(doc_list[idx].sci, line, 0.5); + sci_goto_pos(doc_list[idx].sci, new_pos, FALSE); // set also the cursor the brace + } +} + static void cb_func_edit_tolowercase(void) { on_to_lower_case1_activate(NULL, NULL); Modified: trunk/src/keybindings.h =================================================================== --- trunk/src/keybindings.h 2006-10-11 19:45:40 UTC (rev 883) +++ trunk/src/keybindings.h 2006-10-11 22:01:26 UTC (rev 884) @@ -90,6 +90,7 @@ GEANY_KEYS_EDIT_UNCOMMENTLINE, GEANY_KEYS_EDIT_INCREASEINDENT, GEANY_KEYS_EDIT_DECREASEINDENT, + GEANY_KEYS_EDIT_GOTOMATCHINGBRACE, GEANY_KEYS_EDIT_AUTOCOMPLETE, GEANY_KEYS_EDIT_CALLTIP, GEANY_KEYS_EDIT_MACROLIST, Modified: trunk/src/sciwrappers.c =================================================================== --- trunk/src/sciwrappers.c 2006-10-11 19:45:40 UTC (rev 883) +++ trunk/src/sciwrappers.c 2006-10-11 22:01:26 UTC (rev 884) @@ -865,3 +865,9 @@ { SSM(sci, SCI_AUTOCSETMAXHEIGHT, val, 0); } + +gint sci_find_bracematch(ScintillaObject *sci, gint pos) +{ + return SSM(sci, SCI_BRACEMATCH, pos, 0); +} + Modified: trunk/src/sciwrappers.h =================================================================== --- trunk/src/sciwrappers.h 2006-10-11 19:45:40 UTC (rev 883) +++ trunk/src/sciwrappers.h 2006-10-11 22:01:26 UTC (rev 884) @@ -157,5 +157,6 @@ void sci_select_all (ScintillaObject * sci); gint sci_get_line_indent_position(ScintillaObject * sci, gint line); void sci_set_autoc_max_height (ScintillaObject * sci, gint val); +gint sci_find_bracematch (ScintillaObject * sci, gint pos); #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: [883] trunk
by eht16＠users.sourceforge.net 12 Oct '06

12 Oct '06

Revision: 883 http://svn.sourceforge.net/geany/?rev=883&view=rev Author: eht16 Date: 2006-10-11 12:45:40 -0700 (Wed, 11 Oct 2006) Log Message: ----------- Added simple parser for filetype Diff to create tags for each patched file in a diff file. Modified Paths: -------------- trunk/ChangeLog trunk/src/filetypes.c trunk/src/treeviews.c trunk/tagmanager/Makefile.am trunk/tagmanager/makefile.win32 trunk/tagmanager/parsers.h Added Paths: ----------- trunk/tagmanager/diff.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-10-11 16:42:46 UTC (rev 882) +++ trunk/ChangeLog 2006-10-11 19:45:40 UTC (rev 883) @@ -2,8 +2,13 @@ * src/keyfile.c, src/geany.h: Removed hard limit of session files. * doc/geany.docbook: Updated section about session files limit. + * tagmanager/makefile.win32, tagmanager/Makefile.am, + tagmanager/parsers.h, tagmanager/diff.c, src/filetypes.c, + src/treeviews.c: Added simple parser for filetype Diff to create + tags for each patched file in a diff file. + 2006-10-10 Enrico Tröger <enrico.troeger(a)uvena.de> * src/document.c: Connect only once to the "sci-notify" signal. Modified: trunk/src/filetypes.c =================================================================== --- trunk/src/filetypes.c 2006-10-11 16:42:46 UTC (rev 882) +++ trunk/src/filetypes.c 2006-10-11 19:45:40 UTC (rev 883) @@ -610,7 +610,7 @@ filetypes[GEANY_FILETYPES_DIFF]->item = NULL; filetypes[GEANY_FILETYPES_DIFF]->lang = -2; filetypes[GEANY_FILETYPES_DIFF]->name = g_strdup("Diff"); - filetypes[GEANY_FILETYPES_DIFF]->has_tags = FALSE; + filetypes[GEANY_FILETYPES_DIFF]->has_tags = TRUE; filetypes[GEANY_FILETYPES_DIFF]->title = g_strdup(_("Diff file")); filetypes[GEANY_FILETYPES_DIFF]->extension = g_strdup("diff"); filetypes[GEANY_FILETYPES_DIFF]->pattern = g_new0(gchar*, 3); Modified: trunk/src/treeviews.c =================================================================== --- trunk/src/treeviews.c 2006-10-11 16:42:46 UTC (rev 882) +++ trunk/src/treeviews.c 2006-10-11 19:45:40 UTC (rev 883) @@ -70,6 +70,12 @@ switch (doc_list[idx].file_type->id) { + case GEANY_FILETYPES_DIFF: + { + gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_function), NULL); + gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_function), 0, _("Files"), -1); + break; + } case GEANY_FILETYPES_DOCBOOK: { gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_function), NULL); Modified: trunk/tagmanager/Makefile.am =================================================================== --- trunk/tagmanager/Makefile.am 2006-10-11 16:42:46 UTC (rev 882) +++ trunk/tagmanager/Makefile.am 2006-10-11 19:45:40 UTC (rev 883) @@ -29,6 +29,7 @@ c.c\ conf.c\ css.c\ + diff.c\ docbook.c\ fortran.c\ make.c\ Added: trunk/tagmanager/diff.c =================================================================== --- trunk/tagmanager/diff.c (rev 0) +++ trunk/tagmanager/diff.c 2006-10-11 19:45:40 UTC (rev 883) @@ -0,0 +1,96 @@ +/* +* +* Copyright (c) 2000-2001, Darren Hiebert +* +* This source code is released for free distribution under the terms of the +* GNU General Public License. +* +* This module contains functions for generating tags for diff files (based on Sh parser). +*/ + +/* +* INCLUDE FILES +*/ +#include "general.h" /* must always come first */ + +#include <ctype.h> +#include <string.h> + +#include "parse.h" +#include "read.h" +#include "vstring.h" + +/* +* DATA DEFINITIONS +*/ +typedef enum { + K_FUNCTION +} diffKind; + +static kindOption DiffKinds [] = { + { TRUE, 'f', "function", "functions"} +}; + +/* +* FUNCTION DEFINITIONS +*/ + +static void findDiffTags (void) +{ + vString *filename = vStringNew (); + const unsigned char *line, *tmp; + + while ((line = fileReadLine ()) != NULL) + { + const unsigned char* cp = line; + boolean skipSlash = TRUE; + + if (strncmp((const char*) cp, "--- ", (size_t) 4) == 0) + { + cp += 4; + if (isspace ((int) *cp)) continue; + + tmp = strrchr(cp, '/'); + if (tmp == NULL) + { // if no / is contained try \ in case of a Windows filename + tmp = strrchr(cp, '\\'); + if (tmp == NULL) + { // last fallback, probably the filename doesn't contain a path, so take it + if (strlen(cp) > 0) + { + tmp = cp; + skipSlash = FALSE; + } + } + } + if (tmp != NULL) + { + if (skipSlash) tmp++; // skip the leading slash or backslash + while (! isspace(*tmp) && *tmp != '\0') + { + vStringPut(filename, *tmp); + tmp++; + } + vStringTerminate(filename); + makeSimpleTag (filename, DiffKinds, K_FUNCTION); + vStringClear (filename); + } + } + } + vStringDelete (filename); +} + +extern parserDefinition* DiffParser (void) +{ + static const char *const patterns [] = { "*.diff", "*.patch", NULL }; + static const char *const extensions [] = { "diff", NULL }; + parserDefinition* const def = parserNew ("Diff"); + def->kinds = DiffKinds; + def->kindCount = KIND_COUNT (DiffKinds); + def->patterns = patterns; + def->extensions = extensions; + def->parser = findDiffTags; + return def; +} + +/* vi:set tabstop=8 shiftwidth=4: */ Modified: trunk/tagmanager/makefile.win32 =================================================================== --- trunk/tagmanager/makefile.win32 2006-10-11 16:42:46 UTC (rev 882) +++ trunk/tagmanager/makefile.win32 2006-10-11 19:45:40 UTC (rev 883) @@ -32,7 +32,7 @@ clean: -$(RM) deps.mak *.o $(COMPLIB) -$(COMPLIB): args.o c.o fortran.o make.o conf.o pascal.o perl.o php.o \ +$(COMPLIB): args.o c.o fortran.o make.o conf.o pascal.o perl.o php.o diff.o \ python.o regex.o sh.o ctags.o entry.o get.o keyword.o options.o parse.o \ read.o sort.o strlist.o latex.o docbook.o tcl.o ruby.o asm.o sql.o css.o vstring.o tm_workspace.o tm_work_object.o \ tm_source_file.o tm_project.o tm_tag.o tm_symbol.o tm_file_entry.o \ Modified: trunk/tagmanager/parsers.h =================================================================== --- trunk/tagmanager/parsers.h 2006-10-11 16:42:46 UTC (rev 882) +++ trunk/tagmanager/parsers.h 2006-10-11 19:45:40 UTC (rev 883) @@ -34,7 +34,8 @@ ShParser, \ DParser, \ FortranParser, \ - FeriteParser + FeriteParser, \ + DiffParser /* langType of each parser @@ -58,6 +59,7 @@ 17 DParser 18 FortranParser 19 FeriteParser +20 DiffParser */ #endif /* _PARSERS_H */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

11 Oct '06

Revision: 882 http://svn.sourceforge.net/geany/?rev=882&view=rev Author: eht16 Date: 2006-10-11 09:42:46 -0700 (Wed, 11 Oct 2006) Log Message: ----------- Updated section about session files limit. Modified Paths: -------------- trunk/ChangeLog trunk/doc/geany.docbook Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-10-11 16:35:21 UTC (rev 881) +++ trunk/ChangeLog 2006-10-11 16:42:46 UTC (rev 882) @@ -1,6 +1,7 @@ 2006-10-11 Enrico Tröger <enrico.troeger(a)uvena.de> * src/keyfile.c, src/geany.h: Removed hard limit of session files. + * doc/geany.docbook: Updated section about session files limit. 2006-10-10 Enrico Tröger <enrico.troeger(a)uvena.de> Modified: trunk/doc/geany.docbook =================================================================== --- trunk/doc/geany.docbook 2006-10-11 16:35:21 UTC (rev 881) +++ trunk/doc/geany.docbook 2006-10-11 16:42:46 UTC (rev 882) @@ -3,10 +3,10 @@ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ <!ENTITY app "Geany"> <!ENTITY app_small "geany"> -<!ENTITY appversion "0.9"> +<!ENTITY appversion "0.10"> <!ENTITY appurl "http://geany.uvena.de"> <!ENTITY author_mail "enrico.troeger(a)uvena.de"> -<!ENTITY date "September 29, 2006"> +<!ENTITY date "October 11, 2006"> <!ENTITY legal SYSTEM "geany_gpl.docbook"> <!ENTITY scikeybinding SYSTEM "scikeybinding.docbook"> ]> @@ -332,14 +332,13 @@ <section id="general_startup"> <title>Startup</title> <para> - At startup, &app; loads the first 15 files from the last time + At startup, &app; loads all files from the last time <application>&app;</application> was launched. You can disable this feature in the preferences dialog(see <xref linkend="confdialog_gen"/>). If you specify some files on the command line, only these files will be opened, but you can find the files from the - last session in the file menu under the "Recent files" item. This contains the last - 15 recently opened files. It may be that &app; loads not exactly 15 session files, this depends - on the compile time option GEANY_SESSION_FILES; the default is 15. For details see - <xref linkend="cto"/>. + last session in the file menu under the "Recent files" item. By default this contains + the last 10 recently opened files. You can change the amount of recently opened + files in the preferences dialog. </para> <para> You can start several instances of Geany, but only the first will load files @@ -691,17 +690,6 @@ </thead> <tbody> <row> - <entry>GEANY_MAX_OPEN_FILES</entry> - <entry>The limit to how many files can be open at the same time.</entry> - <entry>25</entry> - </row> - <row> - <entry>GEANY_SESSION_FILES</entry> - <entry>How many files should be reopened from the last run. Obviously, - the value should be smaller than GEANY_MAX_OPEN_FILES.</entry> - <entry>15</entry> - </row> - <row> <entry>GEANY_WORDCHARS</entry> <entry>These characters define word boundaries.</entry> <entry>(look at sourcecode)</entry> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

11 Oct '06

Revision: 881 http://svn.sourceforge.net/geany/?rev=881&view=rev Author: eht16 Date: 2006-10-11 09:35:21 -0700 (Wed, 11 Oct 2006) Log Message: ----------- Removed hard limit of session files. Modified Paths: -------------- trunk/ChangeLog trunk/src/geany.h trunk/src/keyfile.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-10-10 17:28:12 UTC (rev 880) +++ trunk/ChangeLog 2006-10-11 16:35:21 UTC (rev 881) @@ -1,3 +1,8 @@ +2006-10-11 Enrico Tröger <enrico.troeger(a)uvena.de> + + * src/keyfile.c, src/geany.h: Removed hard limit of session files. + + 2006-10-10 Enrico Tröger <enrico.troeger(a)uvena.de> * src/document.c: Connect only once to the "sci-notify" signal. Modified: trunk/src/geany.h =================================================================== --- trunk/src/geany.h 2006-10-10 17:28:12 UTC (rev 880) +++ trunk/src/geany.h 2006-10-11 16:35:21 UTC (rev 881) @@ -38,7 +38,6 @@ #define GEANY_FILEDEFS_SUBDIR "filedefs" #define GEANY_CODENAME "Kintaro" #define GEANY_HOMEPAGE "http://geany.uvena.de/" -#define GEANY_SESSION_FILES 25 #define GEANY_MAX_TAGS_COUNT 1000 #define GEANY_CHECK_FILE_DELAY 30 #define GEANY_WORDCHARS "_#&abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789\\" Modified: trunk/src/keyfile.c =================================================================== --- trunk/src/keyfile.c 2006-10-10 17:28:12 UTC (rev 880) +++ trunk/src/keyfile.c 2006-10-11 16:35:21 UTC (rev 881) @@ -43,7 +43,7 @@ static gchar *scribble_text = NULL; -static gchar *session_files[GEANY_SESSION_FILES]; +static GPtrArray *session_files = NULL; static gint hpan_position; static gint vpan_position; @@ -56,9 +56,10 @@ guint i = 0, j = 0, max; gint idx; gboolean config_exists; + gboolean have_session_files; GKeyFile *config = g_key_file_new(); gchar *configfile = g_strconcat(app->configdir, G_DIR_SEPARATOR_S, "geany.conf", NULL); - gchar *data; + gchar *data, *tmp; gchar *entry = g_malloc(14); gchar *fname = g_malloc0(256); gchar **recent_files = g_new0(gchar*, app->mru_length + 1); @@ -205,9 +206,9 @@ if (cl_options.load_session) { - // store the last 15(or what ever GEANY_SESSION_FILES is set to) filenames, to reopen the next time + // store the filenames to reopen them the next time max = gtk_notebook_get_n_pages(GTK_NOTEBOOK(app->notebook)); - for(i = 0; (i < max) && (j < GEANY_SESSION_FILES); i++) + for(i = 0; i < max; i++) { idx = document_get_n_idx(i); if (idx >= 0 && doc_list[idx].file_name) @@ -219,11 +220,23 @@ j++; } } - // if open filenames less than GEANY_SESSION_FILES, delete existing saved entries in the list - for(i = j; i < GEANY_SESSION_FILES; i++) + // if open filenames less than saved session files, delete existing entries in the list + have_session_files = TRUE; + i = j; + while (have_session_files) { g_snprintf(entry, 13, "FILE_NAME_%d", i); - g_key_file_set_string(config, "files", entry, ""); + tmp = g_key_file_get_string(config, "files", entry, NULL); + if (tmp == NULL) + { + have_session_files = FALSE; + } + else + { + g_key_file_remove_key(config, "files", entry, NULL); + g_free(tmp); + i++; + } } } @@ -251,6 +264,7 @@ gboolean configuration_load() { gboolean config_exists; + gboolean have_session_files; guint i, geo_len; gint *geo; gsize len = 0; @@ -436,16 +450,21 @@ } g_strfreev(recent_files); - for(i = 0; i < GEANY_SESSION_FILES; i++) + session_files = g_ptr_array_new(); + have_session_files = TRUE; + i = 0; + while (have_session_files) { g_snprintf(entry, 13, "FILE_NAME_%d", i); - session_files[i] = g_key_file_get_string(config, "files", entry, &error); - if (! session_files[i] || error) + tmp_string = g_key_file_get_string(config, "files", entry, &error); + if (! tmp_string || error) { g_error_free(error); error = NULL; - session_files[i] = NULL; + have_session_files = FALSE; } + g_ptr_array_add(session_files, tmp_string); + i++; } g_key_file_free(config); @@ -460,20 +479,21 @@ { gint i; guint x, pos, y, len; - gchar *file, *locale_filename, **array; + gchar *file, *locale_filename, **array, *tmp; gboolean ret = FALSE; - i = app->tab_order_ltr ? 0 : GEANY_SESSION_FILES - 1; - while(TRUE) + i = app->tab_order_ltr ? 0 : (session_files->len - 1); + while (TRUE) { - if (session_files[i] && *session_files[i]) + tmp = g_ptr_array_index(session_files, i); + if (tmp && *tmp) { gint uid = -1; x = 0; y = 0; // yes it is :, it should be a ;, but now it is too late to change it - array = g_strsplit(session_files[i], ":", 3); + array = g_strsplit(tmp, ":", 3); len = g_strv_length(array); // read position @@ -499,12 +519,12 @@ } g_free(locale_filename); } - g_free(session_files[i]); + g_free(tmp); if (app->tab_order_ltr) { i++; - if (i >= GEANY_SESSION_FILES) break; + if (i >= session_files->len) break; } else { @@ -513,6 +533,7 @@ } } + g_ptr_array_free(session_files, TRUE); return ret; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

10 Oct '06

Revision: 880 http://svn.sourceforge.net/geany/?rev=880&view=rev Author: eht16 Date: 2006-10-10 10:28:12 -0700 (Tue, 10 Oct 2006) Log Message: ----------- Fixed several highlighting errors, added new styles: identifier2, important and id. Modified Paths: -------------- trunk/ChangeLog trunk/data/filetypes.css trunk/src/highlighting.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-10-10 16:27:31 UTC (rev 879) +++ trunk/ChangeLog 2006-10-10 17:28:12 UTC (rev 880) @@ -10,6 +10,9 @@ also redone. * src/sci_cb.c: Got rid of goto usage and added auto completion for monitor construct for filetype Ferite. + * src/highlighting.c, data/filetypes.css: + Fixed several highlighting errors, added new styles: identifier2, + important and id. 2006-10-09 Nick Treleaven <nick.treleaven(a)btinternet.com> Modified: trunk/data/filetypes.css =================================================================== --- trunk/data/filetypes.css 2006-10-10 16:27:31 UTC (rev 879) +++ trunk/data/filetypes.css 2006-10-10 17:28:12 UTC (rev 880) @@ -6,14 +6,17 @@ tag=0x2166a4;0xffffff;true;false class=0x007f00;0xffffff;true;false pseudoclass=0x660010;0xffffff;true;true -unknown_pseudoclass=0x000099;0xffffff;false;false -unknown_identifier=0x000099;0xffffff;false;false +unknown_pseudoclass=0xff0099;0xffffff;false;false +unknown_identifier=0xff0099;0xffffff;false;false operator=0x301010;0xffffff;false;false identifier=0x000099;0xffffff;true;false doublestring=0x330066;0xffffff;false;false singlestring=0x330066;0xffffff;false;false attribute=0x007f00;0xffffff;false;false value=0x303030;0xffffff;false;false +id=0x7f0000;0xffffff;false;false +identifier2=0x6b6bff;0xffffff;false;false +important=0xff0000;0xffffff;false;false [keywords] primary=color background-color background-image background-repeat background-attachment background-position background font-family font-style font-variant font-weight font-size font word-spacing letter-spacing text-decoration vertical-align text-transform text-align text-indent line-height margin-top margin-right margin-bottom margin-left margin padding-top padding-right padding-bottom padding-left padding border-top-width border-right-width border-bottom-width border-left-width border-width border-top border-right border-bottom border-left border border-color border-style width height float clear display white-space list-style-type list-style-image list-style-position list-style Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2006-10-10 16:27:31 UTC (rev 879) +++ trunk/src/highlighting.c 2006-10-10 17:28:12 UTC (rev 880) @@ -1868,20 +1868,23 @@ load_keyfiles(config, config_home, "filetypes.css"); - new_style_array(GEANY_FILETYPES_CSS, 13); + new_style_array(GEANY_FILETYPES_CSS, 16); get_keyfile_hex(config, config_home, "styling", "default", "0x003399", "0xffffff", "false", &style_sets[GEANY_FILETYPES_CSS].styling[0]); get_keyfile_hex(config, config_home, "styling", "comment", "0x808080", "0xffffff", "false", &style_sets[GEANY_FILETYPES_CSS].styling[1]); get_keyfile_hex(config, config_home, "styling", "tag", "0x2166a4", "0xffffff", "true", &style_sets[GEANY_FILETYPES_CSS].styling[2]); get_keyfile_hex(config, config_home, "styling", "class", "0x007f00", "0xffffff", "true", &style_sets[GEANY_FILETYPES_CSS].styling[3]); get_keyfile_hex(config, config_home, "styling", "pseudoclass", "0x660010", "0xffffff", "true", &style_sets[GEANY_FILETYPES_CSS].styling[4]); - get_keyfile_hex(config, config_home, "styling", "unknown_pseudoclass", "0x000099", "0xffffff", "false", &style_sets[GEANY_FILETYPES_CSS].styling[5]); - get_keyfile_hex(config, config_home, "styling", "unknown_identifier", "0x000099", "0xffffff", "false", &style_sets[GEANY_FILETYPES_CSS].styling[6]); + get_keyfile_hex(config, config_home, "styling", "unknown_pseudoclass", "0xff0099", "0xffffff", "false", &style_sets[GEANY_FILETYPES_CSS].styling[5]); + get_keyfile_hex(config, config_home, "styling", "unknown_identifier", "0xff0099", "0xffffff", "false", &style_sets[GEANY_FILETYPES_CSS].styling[6]); get_keyfile_hex(config, config_home, "styling", "operator", "0x301010", "0xffffff", "false", &style_sets[GEANY_FILETYPES_CSS].styling[7]); get_keyfile_hex(config, config_home, "styling", "identifier", "0x000099", "0xffffff", "true", &style_sets[GEANY_FILETYPES_CSS].styling[8]); get_keyfile_hex(config, config_home, "styling", "doublestring", "0x330066", "0xffffff", "false", &style_sets[GEANY_FILETYPES_CSS].styling[9]); get_keyfile_hex(config, config_home, "styling", "singlestring", "0x330066", "0xffffff", "false", &style_sets[GEANY_FILETYPES_CSS].styling[10]); get_keyfile_hex(config, config_home, "styling", "attribute", "0x007f00", "0xffffff", "false", &style_sets[GEANY_FILETYPES_CSS].styling[11]); get_keyfile_hex(config, config_home, "styling", "value", "0x303030", "0xffffff", "false", &style_sets[GEANY_FILETYPES_CSS].styling[12]); + get_keyfile_hex(config, config_home, "styling", "id", "0x7f0000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_CSS].styling[13]); + get_keyfile_hex(config, config_home, "styling", "identifier2", "0x6b6bff", "0xffffff", "false", &style_sets[GEANY_FILETYPES_CSS].styling[14]); + get_keyfile_hex(config, config_home, "styling", "important", "0xff0000", "0xffffff", "true", &style_sets[GEANY_FILETYPES_CSS].styling[15]); style_sets[GEANY_FILETYPES_CSS].keywords = g_new(gchar*, 4); get_keyfile_keywords(config, config_home, "keywords", "primary", GEANY_FILETYPES_CSS, 0, @@ -1894,7 +1897,8 @@ border-top border-right border-bottom border-left border \ border-color border-style width height float clear \ display white-space list-style-type list-style-image list-style-position list-style"); - get_keyfile_keywords(config, config_home, "keywords", "secondary", GEANY_FILETYPES_CSS, 1, + get_keyfile_keywords(config, config_home, "keywords", "pseudoclasses", GEANY_FILETYPES_CSS, 1, "first-letter first-line link active visited lang first-child focus hover before after left right first"); + get_keyfile_keywords(config, config_home, "keywords", "secondary", GEANY_FILETYPES_CSS, 2, "border-top-color border-right-color border-bottom-color border-left-color border-color \ border-top-style border-right-style border-bottom-style border-left-style border-style \ top right bottom left position z-index direction unicode-bidi \ @@ -1909,7 +1913,6 @@ volume speak pause-before pause-after pause cue-before cue-after cue \ play-during azimuth elevation speech-rate voice-family pitch pitch-range stress richness \ speak-punctuation speak-numeral"); - get_keyfile_keywords(config, config_home, "keywords", "pseudoclasses", GEANY_FILETYPES_CSS, 2, "first-letter first-line link active visited lang first-child focus hover before after left right first"); style_sets[GEANY_FILETYPES_CSS].keywords[3] = NULL; get_keyfile_wordchars(config, config_home, GEANY_WORDCHARS, @@ -1929,6 +1932,10 @@ SSM(sci, SCI_SETWORDCHARS, 0, (sptr_t) style_sets[GEANY_FILETYPES_CSS].wordchars); SSM(sci, SCI_AUTOCSETMAXHEIGHT, app->autocompletion_max_height, 0); + SSM(sci, SCI_SETKEYWORDS, 0, (sptr_t) style_sets[GEANY_FILETYPES_CSS].keywords[0]); + SSM(sci, SCI_SETKEYWORDS, 1, (sptr_t) style_sets[GEANY_FILETYPES_CSS].keywords[1]); + SSM(sci, SCI_SETKEYWORDS, 2, (sptr_t) style_sets[GEANY_FILETYPES_CSS].keywords[2]); + SSM(sci, SCI_SETLEXER, SCLEX_CSS, 0); set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_CSS, 0); @@ -1945,6 +1952,9 @@ set_sci_style(sci, SCE_CSS_SINGLESTRING, GEANY_FILETYPES_CSS, 10); set_sci_style(sci, SCE_CSS_ATTRIBUTE, GEANY_FILETYPES_CSS, 11); set_sci_style(sci, SCE_CSS_VALUE, GEANY_FILETYPES_CSS, 12); + set_sci_style(sci, SCE_CSS_ID, GEANY_FILETYPES_CSS, 13); + set_sci_style(sci, SCE_CSS_IDENTIFIER2, GEANY_FILETYPES_CSS, 14); + set_sci_style(sci, SCE_CSS_IMPORTANT, GEANY_FILETYPES_CSS, 15); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits October 2006