Commits January 2007

commits@lists.geany.org

3 participants
87 discussions

SF.net SVN: geany: [1188] trunk
by eht16＠users.sourceforge.net 14 Jan '07

14 Jan '07

Revision: 1188 http://svn.sourceforge.net/geany/?rev=1188&view=rev Author: eht16 Date: 2007-01-14 09:36:42 -0800 (Sun, 14 Jan 2007) Log Message: ----------- Updated copyright information. Modified Paths: -------------- trunk/ChangeLog trunk/README trunk/geany_private.rc trunk/src/about.c trunk/src/about.h trunk/src/build.c trunk/src/build.h trunk/src/callbacks.c trunk/src/callbacks.h trunk/src/dialogs.c trunk/src/dialogs.h trunk/src/document.c trunk/src/document.h trunk/src/encodings.c trunk/src/encodings.h trunk/src/filetypes.c trunk/src/filetypes.h trunk/src/gb.c trunk/src/geany.h trunk/src/highlighting.c trunk/src/highlighting.h trunk/src/images.c trunk/src/keybindings.c trunk/src/keybindings.h trunk/src/keyfile.c trunk/src/keyfile.h trunk/src/main.c trunk/src/main.h trunk/src/msgwindow.c trunk/src/msgwindow.h trunk/src/notebook.c trunk/src/notebook.h trunk/src/prefs.c trunk/src/prefs.h trunk/src/sci_cb.c trunk/src/sci_cb.h trunk/src/sciwrappers.c trunk/src/sciwrappers.h trunk/src/search.c trunk/src/search.h trunk/src/socket.c trunk/src/socket.h trunk/src/symbols.c trunk/src/symbols.h trunk/src/templates.c trunk/src/templates.h trunk/src/tools.c trunk/src/tools.h trunk/src/treeviews.c trunk/src/treeviews.h trunk/src/ui_utils.c trunk/src/ui_utils.h trunk/src/utils.c trunk/src/utils.h trunk/src/vte.c trunk/src/vte.h trunk/src/win32.c trunk/src/win32.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-01-14 17:13:38 UTC (rev 1187) +++ trunk/ChangeLog 2007-01-14 17:36:42 UTC (rev 1188) @@ -10,6 +10,8 @@ Applied patch from Jeff Pohlmeyer to add an option for using spaces or tabulators when inserting some whitespace. * src/about.c: Updated copyright information. + * geany_private.rc, README, src/*.c, src/*.h: + Updated copyright information. 2007-01-14 Nick Treleaven <nick.treleaven(a)btinternet.com> Modified: trunk/README =================================================================== --- trunk/README 2007-01-14 17:13:38 UTC (rev 1187) +++ trunk/README 2007-01-14 17:36:42 UTC (rev 1188) @@ -91,5 +91,5 @@ -- -2005-2006 by Enrico Tröger, Nick Treleaven and Frank Lanitz +2005-2007 by Enrico Tröger, Nick Treleaven and Frank Lanitz enrico.troeger(a)uvena.de Modified: trunk/geany_private.rc =================================================================== --- trunk/geany_private.rc 2007-01-14 17:13:38 UTC (rev 1187) +++ trunk/geany_private.rc 2007-01-14 17:36:42 UTC (rev 1188) @@ -15,9 +15,9 @@ { VALUE "CompanyName", "" VALUE "FileVersion", "0.11svn" - VALUE "FileDescription", "Small and lightweight IDE (built using mingw gcc)" + VALUE "FileDescription", "Geany" VALUE "InternalName", "geany" - VALUE "LegalCopyright", "Copyright 2005-2006 by Enrico Troeger" + VALUE "LegalCopyright", "Copyright 2005-2007 by Enrico Troeger" VALUE "LegalTrademarks", "" VALUE "OriginalFilename", "geany" VALUE "ProductName", "geany" Modified: trunk/src/about.c =================================================================== --- trunk/src/about.c 2007-01-14 17:13:38 UTC (rev 1187) +++ trunk/src/about.c 2007-01-14 17:36:42 UTC (rev 1188) @@ -1,7 +1,7 @@ /* * about.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2007 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2005-2007 Enrico Tröger <enrico.troeger(a)uvena.de> * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify Modified: trunk/src/about.h =================================================================== --- trunk/src/about.h 2007-01-14 17:13:38 UTC (rev 1187) +++ trunk/src/about.h 2007-01-14 17:36:42 UTC (rev 1188) @@ -1,7 +1,8 @@ /* * about.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2005-2007 Enrico Tröger <enrico.troeger(a)uvena.de> + * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2007-01-14 17:13:38 UTC (rev 1187) +++ trunk/src/build.c 2007-01-14 17:36:42 UTC (rev 1188) @@ -1,7 +1,7 @@ /* * build.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2007 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2005-2007 Enrico Tröger <enrico.troeger(a)uvena.de> * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify Modified: trunk/src/build.h =================================================================== --- trunk/src/build.h 2007-01-14 17:13:38 UTC (rev 1187) +++ trunk/src/build.h 2007-01-14 17:36:42 UTC (rev 1188) @@ -1,7 +1,8 @@ /* * build.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2005-2007 Enrico Tröger <enrico.troeger(a)uvena.de> + * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2007-01-14 17:13:38 UTC (rev 1187) +++ trunk/src/callbacks.c 2007-01-14 17:36:42 UTC (rev 1188) @@ -1,7 +1,7 @@ /* * callbacks.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2007 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2005-2007 Enrico Tröger <enrico.troeger(a)uvena.de> * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify Modified: trunk/src/callbacks.h =================================================================== --- trunk/src/callbacks.h 2007-01-14 17:13:38 UTC (rev 1187) +++ trunk/src/callbacks.h 2007-01-14 17:36:42 UTC (rev 1188) @@ -1,7 +1,7 @@ /* * callbacks.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2007 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2005-2007 Enrico Tröger <enrico.troeger(a)uvena.de> * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify Modified: trunk/src/dialogs.c =================================================================== --- trunk/src/dialogs.c 2007-01-14 17:13:38 UTC (rev 1187) +++ trunk/src/dialogs.c 2007-01-14 17:36:42 UTC (rev 1188) @@ -1,7 +1,8 @@ /* * dialogs.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2005-2007 Enrico Tröger <enrico.troeger(a)uvena.de> + * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/dialogs.h =================================================================== --- trunk/src/dialogs.h 2007-01-14 17:13:38 UTC (rev 1187) +++ trunk/src/dialogs.h 2007-01-14 17:36:42 UTC (rev 1188) @@ -1,7 +1,8 @@ /* * dialogs.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2005-2007 Enrico Tröger <enrico.troeger(a)uvena.de> + * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2007-01-14 17:13:38 UTC (rev 1187) +++ trunk/src/document.c 2007-01-14 17:36:42 UTC (rev 1188) @@ -1,7 +1,7 @@ /* * document.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2007 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2005-2007 Enrico Tröger <enrico.troeger(a)uvena.de> * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify Modified: trunk/src/document.h =================================================================== --- trunk/src/document.h 2007-01-14 17:13:38 UTC (rev 1187) +++ trunk/src/document.h 2007-01-14 17:36:42 UTC (rev 1188) @@ -1,7 +1,8 @@ /* * document.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2005-2007 Enrico Tröger <enrico.troeger(a)uvena.de> + * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/encodings.c =================================================================== --- trunk/src/encodings.c 2007-01-14 17:13:38 UTC (rev 1187) +++ trunk/src/encodings.c 2007-01-14 17:36:42 UTC (rev 1188) @@ -1,7 +1,8 @@ /* * encodings.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2005-2007 Enrico Tröger <enrico.troeger(a)uvena.de> + * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/encodings.h =================================================================== --- trunk/src/encodings.h 2007-01-14 17:13:38 UTC (rev 1187) +++ trunk/src/encodings.h 2007-01-14 17:36:42 UTC (rev 1188) @@ -1,7 +1,8 @@ /* * encodings.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2005-2007 Enrico Tröger <enrico.troeger(a)uvena.de> + * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/filetypes.c =================================================================== --- trunk/src/filetypes.c 2007-01-14 17:13:38 UTC (rev 1187) +++ trunk/src/filetypes.c 2007-01-14 17:36:42 UTC (rev 1188) @@ -1,7 +1,7 @@ /* * filetypes.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2007 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2005-2007 Enrico Tröger <enrico.troeger(a)uvena.de> * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify Modified: trunk/src/filetypes.h =================================================================== --- trunk/src/filetypes.h 2007-01-14 17:13:38 UTC (rev 1187) +++ trunk/src/filetypes.h 2007-01-14 17:36:42 UTC (rev 1188) @@ -1,7 +1,7 @@ /* * filetypes.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2007 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2005-2007 Enrico Tröger <enrico.troeger(a)uvena.de> * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify Modified: trunk/src/gb.c =================================================================== --- trunk/src/gb.c 2007-01-14 17:13:38 UTC (rev 1187) +++ trunk/src/gb.c 2007-01-14 17:36:42 UTC (rev 1188) @@ -1,7 +1,8 @@ /* * gb.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2005-2007 Enrico Tröger <enrico.troeger(a)uvena.de> + * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/geany.h =================================================================== --- trunk/src/geany.h 2007-01-14 17:13:38 UTC (rev 1187) +++ trunk/src/geany.h 2007-01-14 17:36:42 UTC (rev 1188) @@ -1,7 +1,7 @@ /* * geany.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2007 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2005-2007 Enrico Tröger <enrico.troeger(a)uvena.de> * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2007-01-14 17:13:38 UTC (rev 1187) +++ trunk/src/highlighting.c 2007-01-14 17:36:42 UTC (rev 1188) @@ -1,7 +1,7 @@ /* * highlighting.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2007 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2005-2007 Enrico Tröger <enrico.troeger(a)uvena.de> * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify Modified: trunk/src/highlighting.h =================================================================== --- trunk/src/highlighting.h 2007-01-14 17:13:38 UTC (rev 1187) +++ trunk/src/highlighting.h 2007-01-14 17:36:42 UTC (rev 1188) @@ -1,7 +1,7 @@ /* * highlighting.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2007 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2005-2007 Enrico Tröger <enrico.troeger(a)uvena.de> * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify Modified: trunk/src/images.c =================================================================== --- trunk/src/images.c 2007-01-14 17:13:38 UTC (rev 1187) +++ trunk/src/images.c 2007-01-14 17:36:42 UTC (rev 1188) @@ -1,7 +1,8 @@ /* * images.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2005-2007 Enrico Tröger <enrico.troeger(a)uvena.de> + * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/keybindings.c =================================================================== --- trunk/src/keybindings.c 2007-01-14 17:13:38 UTC (rev 1187) +++ trunk/src/keybindings.c 2007-01-14 17:36:42 UTC (rev 1188) @@ -1,7 +1,8 @@ /* * keybindings.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2006-2007 Enrico Tröger <enrico.troeger(a)uvena.de> + * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/keybindings.h =================================================================== --- trunk/src/keybindings.h 2007-01-14 17:13:38 UTC (rev 1187) +++ trunk/src/keybindings.h 2007-01-14 17:36:42 UTC (rev 1188) @@ -1,7 +1,8 @@ /* * keybindings.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2006-2007 Enrico Tröger <enrico.troeger(a)uvena.de> + * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/keyfile.c =================================================================== --- trunk/src/keyfile.c 2007-01-14 17:13:38 UTC (rev 1187) +++ trunk/src/keyfile.c 2007-01-14 17:36:42 UTC (rev 1188) @@ -1,7 +1,7 @@ /* * keyfile.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2007 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2005-2007 Enrico Tröger <enrico.troeger(a)uvena.de> * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify Modified: trunk/src/keyfile.h =================================================================== --- trunk/src/keyfile.h 2007-01-14 17:13:38 UTC (rev 1187) +++ trunk/src/keyfile.h 2007-01-14 17:36:42 UTC (rev 1188) @@ -1,7 +1,8 @@ /* * keyfile.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2005-2007 Enrico Tröger <enrico.troeger(a)uvena.de> + * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/main.c =================================================================== --- trunk/src/main.c 2007-01-14 17:13:38 UTC (rev 1187) +++ trunk/src/main.c 2007-01-14 17:36:42 UTC (rev 1188) @@ -1,7 +1,8 @@ /* * main.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2005-2007 Enrico Tröger <enrico.troeger(a)uvena.de> + * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/main.h =================================================================== --- trunk/src/main.h 2007-01-14 17:13:38 UTC (rev 1187) +++ trunk/src/main.h 2007-01-14 17:36:42 UTC (rev 1188) @@ -1,8 +1,8 @@ /* * main.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006 Enrico Troeger <enrico.troeger(a)uvena.de> - * Copyright 2006 Nick Treleaven <nick.treleaven(a)btinternet.com> + * Copyright 2006-2007 Enrico Tröger <enrico.troeger(a)uvena.de> + * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/msgwindow.c =================================================================== --- trunk/src/msgwindow.c 2007-01-14 17:13:38 UTC (rev 1187) +++ trunk/src/msgwindow.c 2007-01-14 17:36:42 UTC (rev 1188) @@ -1,7 +1,8 @@ /* * msgwindow.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2005-2007 Enrico Tröger <enrico.troeger(a)uvena.de> + * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/msgwindow.h =================================================================== --- trunk/src/msgwindow.h 2007-01-14 17:13:38 UTC (rev 1187) +++ trunk/src/msgwindow.h 2007-01-14 17:36:42 UTC (rev 1188) @@ -1,7 +1,8 @@ /* * msgwindow.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2005-2007 Enrico Tröger <enrico.troeger(a)uvena.de> + * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/notebook.c =================================================================== --- trunk/src/notebook.c 2007-01-14 17:13:38 UTC (rev 1187) +++ trunk/src/notebook.c 2007-01-14 17:36:42 UTC (rev 1188) @@ -1,8 +1,8 @@ /* * notebook.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006 Enrico Troeger <enrico.troeger(a)uvena.de> - * Copyright 2006 Nick Treleaven <nick.treleaven(a)btinternet.com> + * Copyright 2006-2007 Enrico Tröger <enrico.troeger(a)uvena.de> + * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/notebook.h =================================================================== --- trunk/src/notebook.h 2007-01-14 17:13:38 UTC (rev 1187) +++ trunk/src/notebook.h 2007-01-14 17:36:42 UTC (rev 1188) @@ -1,8 +1,8 @@ /* * notebook.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006 Enrico Troeger <enrico.troeger(a)uvena.de> - * Copyright 2006 Nick Treleaven <nick.treleaven(a)btinternet.com> + * Copyright 2006-2007 Enrico Tröger <enrico.troeger(a)uvena.de> + * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/prefs.c =================================================================== --- trunk/src/prefs.c 2007-01-14 17:13:38 UTC (rev 1187) +++ trunk/src/prefs.c 2007-01-14 17:36:42 UTC (rev 1188) @@ -1,7 +1,7 @@ /* * prefs.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2007 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2005-2007 Enrico Tröger <enrico.troeger(a)uvena.de> * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify Modified: trunk/src/prefs.h =================================================================== --- trunk/src/prefs.h 2007-01-14 17:13:38 UTC (rev 1187) +++ trunk/src/prefs.h 2007-01-14 17:36:42 UTC (rev 1188) @@ -1,7 +1,8 @@ /* * prefs.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2005-2007 Enrico Tröger <enrico.troeger(a)uvena.de> + * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/sci_cb.c =================================================================== --- trunk/src/sci_cb.c 2007-01-14 17:13:38 UTC (rev 1187) +++ trunk/src/sci_cb.c 2007-01-14 17:36:42 UTC (rev 1188) @@ -1,7 +1,7 @@ /* * sci_cb.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2007 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2005-2007 Enrico Tröger <enrico.troeger(a)uvena.de> * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify Modified: trunk/src/sci_cb.h =================================================================== --- trunk/src/sci_cb.h 2007-01-14 17:13:38 UTC (rev 1187) +++ trunk/src/sci_cb.h 2007-01-14 17:36:42 UTC (rev 1188) @@ -1,7 +1,7 @@ /* * sci_cb.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2007 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2005-2007 Enrico Tröger <enrico.troeger(a)uvena.de> * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify Modified: trunk/src/sciwrappers.c =================================================================== --- trunk/src/sciwrappers.c 2007-01-14 17:13:38 UTC (rev 1187) +++ trunk/src/sciwrappers.c 2007-01-14 17:36:42 UTC (rev 1188) @@ -1,7 +1,8 @@ /* * sciwrappers.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2005-2007 Enrico Tröger <enrico.troeger(a)uvena.de> + * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/sciwrappers.h =================================================================== --- trunk/src/sciwrappers.h 2007-01-14 17:13:38 UTC (rev 1187) +++ trunk/src/sciwrappers.h 2007-01-14 17:36:42 UTC (rev 1188) @@ -1,7 +1,7 @@ /* * sciwrappers.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2007 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2005-2007 Enrico Tröger <enrico.troeger(a)uvena.de> * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify Modified: trunk/src/search.c =================================================================== --- trunk/src/search.c 2007-01-14 17:13:38 UTC (rev 1187) +++ trunk/src/search.c 2007-01-14 17:36:42 UTC (rev 1188) @@ -1,8 +1,8 @@ /* * search.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006 Enrico Troeger <enrico.troeger(a)uvena.de> - * Copyright 2006 Nick Treleaven <nick.treleaven(a)btinternet.com> + * Copyright 2006-2007 Enrico Tröger <enrico.troeger(a)uvena.de> + * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/search.h =================================================================== --- trunk/src/search.h 2007-01-14 17:13:38 UTC (rev 1187) +++ trunk/src/search.h 2007-01-14 17:36:42 UTC (rev 1188) @@ -1,8 +1,8 @@ /* * search.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006 Enrico Troeger <enrico.troeger(a)uvena.de> - * Copyright 2006 Nick Treleaven <nick.treleaven(a)btinternet.com> + * Copyright 2006-2007 Enrico Tröger <enrico.troeger(a)uvena.de> + * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/socket.c =================================================================== --- trunk/src/socket.c 2007-01-14 17:13:38 UTC (rev 1187) +++ trunk/src/socket.c 2007-01-14 17:36:42 UTC (rev 1188) @@ -1,7 +1,8 @@ /* * socket.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006 Enrico Tröger <enrico.troeger(a)uvena.de> + * Copyright 2006-2007 Enrico Tröger <enrico.troeger(a)uvena.de> + * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/socket.h =================================================================== --- trunk/src/socket.h 2007-01-14 17:13:38 UTC (rev 1187) +++ trunk/src/socket.h 2007-01-14 17:36:42 UTC (rev 1188) @@ -1,7 +1,8 @@ /* * socket.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2006-2007 Enrico Tröger <enrico.troeger(a)uvena.de> + * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/symbols.c =================================================================== --- trunk/src/symbols.c 2007-01-14 17:13:38 UTC (rev 1187) +++ trunk/src/symbols.c 2007-01-14 17:36:42 UTC (rev 1188) @@ -1,8 +1,8 @@ /* * symbols.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006 Enrico Troeger <enrico.troeger(a)uvena.de> - * Copyright 2006 Nick Treleaven <nick.treleaven(a)btinternet.com> + * Copyright 2006-2007 Enrico Tröger <enrico.troeger(a)uvena.de> + * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/symbols.h =================================================================== --- trunk/src/symbols.h 2007-01-14 17:13:38 UTC (rev 1187) +++ trunk/src/symbols.h 2007-01-14 17:36:42 UTC (rev 1188) @@ -1,8 +1,8 @@ /* * symbols.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006 Enrico Troeger <enrico.troeger(a)uvena.de> - * Copyright 2006 Nick Treleaven <nick.treleaven(a)btinternet.com> + * Copyright 2006-2007 Enrico Tröger <enrico.troeger(a)uvena.de> + * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/templates.c =================================================================== --- trunk/src/templates.c 2007-01-14 17:13:38 UTC (rev 1187) +++ trunk/src/templates.c 2007-01-14 17:36:42 UTC (rev 1188) @@ -1,7 +1,7 @@ /* * templates.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2007 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2005-2007 Enrico Tröger <enrico.troeger(a)uvena.de> * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify Modified: trunk/src/templates.h =================================================================== --- trunk/src/templates.h 2007-01-14 17:13:38 UTC (rev 1187) +++ trunk/src/templates.h 2007-01-14 17:36:42 UTC (rev 1188) @@ -1,7 +1,7 @@ /* * templates.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2007 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2005-2007 Enrico Tröger <enrico.troeger(a)uvena.de> * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify Modified: trunk/src/tools.c =================================================================== --- trunk/src/tools.c 2007-01-14 17:13:38 UTC (rev 1187) +++ trunk/src/tools.c 2007-01-14 17:36:42 UTC (rev 1188) @@ -1,8 +1,8 @@ /* * tools.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006 Enrico Troeger <enrico.troeger(a)uvena.de> - * Copyright 2006 Nick Treleaven <nick.treleaven(a)btinternet.com> + * Copyright 2006-2007 Enrico Tröger <enrico.troeger(a)uvena.de> + * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/tools.h =================================================================== --- trunk/src/tools.h 2007-01-14 17:13:38 UTC (rev 1187) +++ trunk/src/tools.h 2007-01-14 17:36:42 UTC (rev 1188) @@ -1,8 +1,8 @@ /* * tools.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006 Enrico Troeger <enrico.troeger(a)uvena.de> - * Copyright 2006 Nick Treleaven <nick.treleaven(a)btinternet.com> + * Copyright 2006-2007 Enrico Tröger <enrico.troeger(a)uvena.de> + * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/treeviews.c =================================================================== --- trunk/src/treeviews.c 2007-01-14 17:13:38 UTC (rev 1187) +++ trunk/src/treeviews.c 2007-01-14 17:36:42 UTC (rev 1188) @@ -1,7 +1,8 @@ /* * treeviews.c * - * Copyright 2006 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2005-2007 Enrico Tröger <enrico.troeger(a)uvena.de> + * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/treeviews.h =================================================================== --- trunk/src/treeviews.h 2007-01-14 17:13:38 UTC (rev 1187) +++ trunk/src/treeviews.h 2007-01-14 17:36:42 UTC (rev 1188) @@ -1,7 +1,8 @@ /* * treeviws.h * - * Copyright 2006 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2005-2007 Enrico Tröger <enrico.troeger(a)uvena.de> + * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/ui_utils.c =================================================================== --- trunk/src/ui_utils.c 2007-01-14 17:13:38 UTC (rev 1187) +++ trunk/src/ui_utils.c 2007-01-14 17:36:42 UTC (rev 1188) @@ -1,7 +1,7 @@ /* * ui_utils.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006-2007 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2006-2007 Enrico Tröger <enrico.troeger(a)uvena.de> * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify Modified: trunk/src/ui_utils.h =================================================================== --- trunk/src/ui_utils.h 2007-01-14 17:13:38 UTC (rev 1187) +++ trunk/src/ui_utils.h 2007-01-14 17:36:42 UTC (rev 1188) @@ -1,8 +1,8 @@ /* * ui_utils.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006 Enrico Troeger <enrico.troeger(a)uvena.de> - * Copyright 2006 Nick Treleaven <nick.treleaven(a)btinternet.com> + * Copyright 2006-2007 Enrico Tröger <enrico.troeger(a)uvena.de> + * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2007-01-14 17:13:38 UTC (rev 1187) +++ trunk/src/utils.c 2007-01-14 17:36:42 UTC (rev 1188) @@ -1,7 +1,7 @@ /* * utils.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2007 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2005-2007 Enrico Tröger <enrico.troeger(a)uvena.de> * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify Modified: trunk/src/utils.h =================================================================== --- trunk/src/utils.h 2007-01-14 17:13:38 UTC (rev 1187) +++ trunk/src/utils.h 2007-01-14 17:36:42 UTC (rev 1188) @@ -1,7 +1,7 @@ /* * utils.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005-2007 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2005-2007 Enrico Tröger <enrico.troeger(a)uvena.de> * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify Modified: trunk/src/vte.c =================================================================== --- trunk/src/vte.c 2007-01-14 17:13:38 UTC (rev 1187) +++ trunk/src/vte.c 2007-01-14 17:36:42 UTC (rev 1188) @@ -1,7 +1,8 @@ /* * vte.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2005-2007 Enrico Tröger <enrico.troeger(a)uvena.de> + * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/vte.h =================================================================== --- trunk/src/vte.h 2007-01-14 17:13:38 UTC (rev 1187) +++ trunk/src/vte.h 2007-01-14 17:36:42 UTC (rev 1188) @@ -1,7 +1,8 @@ /* * vte.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2005-2007 Enrico Tröger <enrico.troeger(a)uvena.de> + * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/win32.c =================================================================== --- trunk/src/win32.c 2007-01-14 17:13:38 UTC (rev 1187) +++ trunk/src/win32.c 2007-01-14 17:36:42 UTC (rev 1188) @@ -1,7 +1,8 @@ /* * win32.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2005-2007 Enrico Tröger <enrico.troeger(a)uvena.de> + * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/src/win32.h =================================================================== --- trunk/src/win32.h 2007-01-14 17:13:38 UTC (rev 1187) +++ trunk/src/win32.h 2007-01-14 17:36:42 UTC (rev 1188) @@ -1,7 +1,8 @@ /* * win32.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2005-2007 Enrico Tröger <enrico.troeger(a)uvena.de> + * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1187] trunk
by eht16＠users.sourceforge.net 14 Jan '07

14 Jan '07

Revision: 1187 http://svn.sourceforge.net/geany/?rev=1187&view=rev Author: eht16 Date: 2007-01-14 09:13:38 -0800 (Sun, 14 Jan 2007) Log Message: ----------- Updated copyright information. Modified Paths: -------------- trunk/ChangeLog trunk/src/about.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-01-14 17:09:17 UTC (rev 1186) +++ trunk/ChangeLog 2007-01-14 17:13:38 UTC (rev 1187) @@ -9,6 +9,7 @@ Moved free_pointers() to utils.c. Applied patch from Jeff Pohlmeyer to add an option for using spaces or tabulators when inserting some whitespace. + * src/about.c: Updated copyright information. 2007-01-14 Nick Treleaven <nick.treleaven(a)btinternet.com> Modified: trunk/src/about.c =================================================================== --- trunk/src/about.c 2007-01-14 17:09:17 UTC (rev 1186) +++ trunk/src/about.c 2007-01-14 17:13:38 UTC (rev 1187) @@ -1,7 +1,8 @@ /* * about.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2005-2007 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -34,7 +35,7 @@ #define INFO "%s" #define CODENAME "\"" GEANY_CODENAME "\"" #define BUILDDATE "%s" -#define COPYRIGHT "Copyright (c) 2005-2006 \n Enrico Tröger \nAll rights reserved." +#define COPYRIGHT "Copyright (c) 2005-2007\nEnrico Tröger\nNick Treleaven\nFrank Lanitz\nAll rights reserved." #define CREDITS \ "%s\n\t\ Enrico Tröger - %s\n\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: [1186] trunk
by eht16＠users.sourceforge.net 14 Jan '07

14 Jan '07

Revision: 1186 http://svn.sourceforge.net/geany/?rev=1186&view=rev Author: eht16 Date: 2007-01-14 09:09:17 -0800 (Sun, 14 Jan 2007) Log Message: ----------- Added sci_set_use_tabs(). Fixed mem leak in sci_cb_auto_forif(). Moved free_pointers() to utils.c. Applied patch from Jeff Pohlmeyer to add an option for using spaces or tabulators when inserting some whitespace. Modified Paths: -------------- trunk/ChangeLog trunk/geany.glade trunk/src/build.c trunk/src/document.c trunk/src/geany.h trunk/src/highlighting.c trunk/src/interface.c trunk/src/keyfile.c trunk/src/prefs.c trunk/src/sci_cb.c trunk/src/sciwrappers.c trunk/src/sciwrappers.h trunk/src/utils.c trunk/src/utils.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-01-14 13:36:30 UTC (rev 1185) +++ trunk/ChangeLog 2007-01-14 17:09:17 UTC (rev 1186) @@ -1,3 +1,16 @@ +2007-01-14 Enrico Tröger <enrico.troeger(a)uvena.de> + + * geany.glade, src/build.c, src/document.c, src/geany.h, + src/highlighting.c, src/interface.c, src/keyfile.c, src/prefs.c, + src/sci_cb.c, src/sci_wrappers.c, src/sciwrappers.h, src/utils.c, + src/utils.h: + Added sci_set_use_tabs(). + Fixed mem leak in sci_cb_auto_forif(). + Moved free_pointers() to utils.c. + Applied patch from Jeff Pohlmeyer to add an option for using spaces + or tabulators when inserting some whitespace. + + 2007-01-14 Nick Treleaven <nick.treleaven(a)btinternet.com> * src/treeviews.c, src/treeviews.h, src/symbols.c, po/POTFILES.in: Modified: trunk/geany.glade =================================================================== --- trunk/geany.glade 2007-01-14 13:36:30 UTC (rev 1185) +++ trunk/geany.glade 2007-01-14 17:09:17 UTC (rev 1186) @@ -5237,6 +5237,26 @@ <property name="fill">False</property> </packing> </child> + + <child> + <widget class="GtkCheckButton" id="check_use_tabs"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Whenever some whitespace is inserted by Geany it will use tabluators when enabled otherwise Geany will use just spaces.</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Use tabulators when inserting whitespace</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">False</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> </widget> </child> </widget> Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2007-01-14 13:36:30 UTC (rev 1185) +++ trunk/src/build.c 2007-01-14 17:09:17 UTC (rev 1186) @@ -1,7 +1,8 @@ /* * build.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2005-2007 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -29,7 +30,6 @@ #include <sys/stat.h> #include <unistd.h> #include <errno.h> -#include <stdarg.h> #ifdef G_OS_UNIX # include <sys/types.h> @@ -78,7 +78,6 @@ static void set_stop_button(gboolean stop); static void build_exit_cb(GPid child_pid, gint status, gpointer user_data); static void run_exit_cb(GPid child_pid, gint status, gpointer user_data); -static void free_pointers(gpointer first, ...); #ifndef G_OS_WIN32 static void kill_process(GPid *pid); @@ -154,7 +153,7 @@ if (stat(locale_filename, &st) != 0) { msgwin_status_add(_("Failed to view %s (make sure it is already compiled)"), view_file); - free_pointers(executable, view_file, locale_filename, script_name); + utils_free_pointers(executable, view_file, locale_filename, script_name, NULL); return (GPid) 1; } @@ -189,8 +188,8 @@ _("Could not find terminal '%s' " "(check path for Terminal tool setting in Preferences)"), app->tools_term_cmd); - free_pointers(executable, view_file, locale_filename, cmd_string, locale_cmd_string, - script_name, locale_term_cmd); + utils_free_pointers(executable, view_file, locale_filename, cmd_string, locale_cmd_string, + script_name, locale_term_cmd, NULL); g_strfreev(term_argv); return (GPid) 1; } @@ -202,8 +201,8 @@ gchar *utf8_check_executable = utils_remove_ext_from_filename(doc_list[idx].file_name); msgwin_status_add(_("Failed to execute %s (start-script could not be created)"), utf8_check_executable); - free_pointers(executable, view_file, locale_filename, cmd_string, locale_cmd_string, - utf8_check_executable, script_name, locale_term_cmd); + utils_free_pointers(executable, view_file, locale_filename, cmd_string, locale_cmd_string, + utf8_check_executable, script_name, locale_term_cmd, NULL); g_strfreev(term_argv); return (GPid) 1; } @@ -230,8 +229,8 @@ geany_debug("g_spawn_async_with_pipes() failed: %s", error->message); msgwin_status_add(_("Process failed (%s)"), error->message); - free_pointers(executable, view_file, locale_filename, cmd_string, locale_cmd_string, - script_name, locale_term_cmd); + utils_free_pointers(executable, view_file, locale_filename, cmd_string, locale_cmd_string, + script_name, locale_term_cmd, NULL); g_strfreev(argv); g_strfreev(term_argv); g_error_free(error); @@ -246,8 +245,8 @@ build_menu_update(idx); } - free_pointers(executable, view_file, locale_filename, cmd_string, locale_cmd_string, - script_name, locale_term_cmd); + utils_free_pointers(executable, view_file, locale_filename, cmd_string, locale_cmd_string, + script_name, locale_term_cmd, NULL); g_strfreev(argv); g_strfreev(term_argv); @@ -1513,25 +1512,6 @@ #endif -// frees all passed pointers if they are non-NULL, the first argument is nothing special, -// it will also be freed -static void free_pointers(gpointer first, ...) -{ - va_list a; - gpointer sa; - - for (va_start(a, first); (sa = va_arg(a, gpointer), sa!=NULL);) - { - if (sa != NULL) - g_free(sa); - } - va_end(a); - - if (first != NULL) - g_free(first); -} - - void on_build_next_error (GtkMenuItem *menuitem, gpointer user_data) Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2007-01-14 13:36:30 UTC (rev 1185) +++ trunk/src/document.c 2007-01-14 17:09:17 UTC (rev 1186) @@ -179,6 +179,8 @@ sci_set_mark_long_lines(sci, app->long_line_type, app->long_line_column, app->long_line_color); sci_set_tab_width(sci, app->pref_editor_tab_width); + sci_set_use_tabs(sci, app->pref_editor_use_tabs); + sci_set_autoc_max_height(sci, app->autocompletion_max_height); sci_set_indentionguides(sci, app->pref_editor_show_indent_guide); Modified: trunk/src/geany.h =================================================================== --- trunk/src/geany.h 2007-01-14 13:36:30 UTC (rev 1185) +++ trunk/src/geany.h 2007-01-14 17:09:17 UTC (rev 1186) @@ -110,6 +110,7 @@ gboolean pref_editor_folding; gboolean pref_editor_unfold_all_children; gint pref_editor_tab_width; + gboolean pref_editor_use_tabs; gint pref_editor_default_encoding; gboolean pref_editor_new_line; gboolean pref_editor_replace_tabs; Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2007-01-14 13:36:30 UTC (rev 1185) +++ trunk/src/highlighting.c 2007-01-14 17:09:17 UTC (rev 1186) @@ -426,8 +426,6 @@ SSM(sci, SCI_STYLECLEARALL, 0, 0); - SSM(sci, SCI_SETUSETABS, TRUE, 0); - // caret colour SSM(sci, SCI_SETCARETFORE, invert(common_style_set.styling[GCS_CARET].foreground), 0); Modified: trunk/src/interface.c =================================================================== --- trunk/src/interface.c 2007-01-14 13:36:30 UTC (rev 1185) +++ trunk/src/interface.c 2007-01-14 17:09:17 UTC (rev 1186) @@ -2304,6 +2304,7 @@ GtkWidget *check_unfold_children; GtkWidget *check_indicators; GtkWidget *check_disable_dnd; + GtkWidget *check_use_tabs; GtkWidget *label172; GtkWidget *frame18; GtkWidget *alignment21; @@ -3202,6 +3203,12 @@ gtk_tooltips_set_tip (tooltips, check_disable_dnd, _("Disable drag and drop completely in the editor window so you can't drag and drop any selections within or outside of the editor window."), NULL); gtk_button_set_focus_on_click (GTK_BUTTON (check_disable_dnd), FALSE); + check_use_tabs = gtk_check_button_new_with_mnemonic (_("Use tabulators when inserting whitespace")); + gtk_widget_show (check_use_tabs); + gtk_box_pack_start (GTK_BOX (vbox17), check_use_tabs, FALSE, FALSE, 0); + gtk_tooltips_set_tip (tooltips, check_use_tabs, _("Whenever some whitespace is inserted by Geany it will use tabluators when enabled otherwise Geany will use just spaces."), NULL); + gtk_button_set_focus_on_click (GTK_BUTTON (check_use_tabs), FALSE); + label172 = gtk_label_new (_("Features")); gtk_widget_show (label172); gtk_frame_set_label_widget (GTK_FRAME (frame14), label172); @@ -3733,6 +3740,7 @@ GLADE_HOOKUP_OBJECT (prefs_dialog, check_unfold_children, "check_unfold_children"); GLADE_HOOKUP_OBJECT (prefs_dialog, check_indicators, "check_indicators"); GLADE_HOOKUP_OBJECT (prefs_dialog, check_disable_dnd, "check_disable_dnd"); + GLADE_HOOKUP_OBJECT (prefs_dialog, check_use_tabs, "check_use_tabs"); GLADE_HOOKUP_OBJECT (prefs_dialog, label172, "label172"); GLADE_HOOKUP_OBJECT (prefs_dialog, frame18, "frame18"); GLADE_HOOKUP_OBJECT (prefs_dialog, alignment21, "alignment21"); Modified: trunk/src/keyfile.c =================================================================== --- trunk/src/keyfile.c 2007-01-14 13:36:30 UTC (rev 1185) +++ trunk/src/keyfile.c 2007-01-14 17:09:17 UTC (rev 1186) @@ -1,7 +1,8 @@ /* * keyfile.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2005-2007 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -155,6 +156,7 @@ g_key_file_set_integer_list(config, PACKAGE, "geometry", app->geometry, 4); } g_key_file_set_integer(config, PACKAGE, "pref_editor_tab_width", app->pref_editor_tab_width); + g_key_file_set_boolean(config, PACKAGE, "pref_editor_use_tabs", app->pref_editor_use_tabs); g_key_file_set_boolean(config, PACKAGE, "pref_main_confirm_exit", app->pref_main_confirm_exit); g_key_file_set_boolean(config, PACKAGE, "pref_main_suppress_search_dialogs", app->pref_main_suppress_search_dialogs); g_key_file_set_boolean(config, PACKAGE, "pref_main_load_session", app->pref_main_load_session); @@ -354,6 +356,7 @@ app->pref_editor_tab_width = utils_get_setting_integer(config, PACKAGE, "pref_editor_tab_width", 4); + app->pref_editor_use_tabs = utils_get_setting_boolean(config, PACKAGE, "pref_editor_use_tabs", TRUE); tmp_string = utils_get_setting_string(config, PACKAGE, "pref_editor_default_encoding", encodings[GEANY_ENCODING_UTF_8].charset); if (tmp_string) Modified: trunk/src/prefs.c =================================================================== --- trunk/src/prefs.c 2007-01-14 13:36:30 UTC (rev 1185) +++ trunk/src/prefs.c 2007-01-14 17:09:17 UTC (rev 1186) @@ -1,7 +1,8 @@ /* * prefs.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2005-2007 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -250,6 +251,9 @@ widget = lookup_widget(app->prefs_dialog, "check_disable_dnd"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), app->pref_editor_disable_dnd); + widget = lookup_widget(app->prefs_dialog, "check_use_tabs"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), app->pref_editor_use_tabs); + widget = lookup_widget(app->prefs_dialog, "check_indicators"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), app->pref_editor_use_indicators); @@ -556,6 +560,9 @@ widget = lookup_widget(app->prefs_dialog, "check_disable_dnd"); app->pref_editor_disable_dnd = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + widget = lookup_widget(app->prefs_dialog, "check_use_tabs"); + app->pref_editor_use_tabs = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + widget = lookup_widget(app->prefs_dialog, "spin_autocheight"); app->autocompletion_max_height = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget)); Modified: trunk/src/sci_cb.c =================================================================== --- trunk/src/sci_cb.c 2007-01-14 13:36:30 UTC (rev 1185) +++ trunk/src/sci_cb.c 2007-01-14 17:09:17 UTC (rev 1186) @@ -321,9 +321,10 @@ if (doc_list[idx].file_type->id == GEANY_FILETYPES_PYTHON && sci_get_char_at(sci, pos - 2) == ':' && sci_get_style_at(sci, pos - 2) == SCE_P_OPERATOR) - { - /// TODO add something like insert_tabs() which inserts a tab or tab_width times a space - sci_add_text(sci, "\t"); + { // creates and inserts one tabulator sign or whitespace of the amount of the tab width + gchar *text = utils_get_whitespace(app->pref_editor_tab_width); + sci_add_text(sci, text); + g_free(text); } } @@ -353,7 +354,17 @@ // and ignore the case of sci_cb_close_block else if (linebuf[i] == '{' && ! use_this_line) { - indent[j++] = '\t'; + if (app->pref_editor_use_tabs) + { + indent[j++] = '\t'; + } + else + { // insert as many spaces as a tabulator would take + gint i; + for (i = 0; i < app->pref_editor_tab_width; i++) + indent[j++] = ' '; + } + break; } else @@ -363,7 +374,19 @@ while (k > 0 && isspace(linebuf[k])) k--; // if last non-whitespace character is a { increase indention by a tab // e.g. for (...) { - if (linebuf[k] == '{') indent[j++] = '\t'; + if (linebuf[k] == '{') + { + if (app->pref_editor_use_tabs) + { + indent[j++] = '\t'; + } + else + { // insert as many spaces as a tabulator would take + gint i; + for (i = 0; i < app->pref_editor_use_tabs; i++) + indent[j++] = ' '; + } + } break; } } @@ -865,10 +888,12 @@ { static gchar buf[16]; gchar *eol; + gchar *space; gchar *construct; gint lexer, style; gint i; gint last_pos; + gint space_len; ScintillaObject *sci; if (idx == -1 || ! doc_list[idx].is_valid || doc_list[idx].file_type == NULL) return; @@ -895,7 +920,7 @@ if (lexer == SCLEX_HTML && ! (style >= SCE_HPHP_DEFAULT && style <= SCE_HPHP_OPERATOR)) return; - // get the indention + // get the indentation if (doc_list[idx].use_auto_indention) get_indent(sci, pos, TRUE); eol = g_strconcat(utils_get_eol_char(idx), indent, NULL); sci_get_text_range(sci, pos - 16, pos - 1, buf); @@ -912,16 +937,20 @@ i--; } + // get the whitespace for additional indentation + space = utils_get_whitespace(app->pref_editor_tab_width); + space_len = strlen(space); + // "pattern", buf + x, y -> x + y = 15, because buf is (pos - 16)...(pos - 1) = 15 if (! strncmp("if", buf + 13, 2)) { if (! isspace(*(buf + 12))) { - g_free(eol); + utils_free_pointers(eol, space, NULL); return; } - construct = g_strdup_printf("()%s{%s\t%s}%s", eol, eol, eol, eol); + construct = g_strdup_printf("()%s{%s%s%s}%s", eol, eol, space, eol, eol); SSM(sci, SCI_INSERTTEXT, pos, (sptr_t) construct); sci_goto_pos(sci, pos + 1, TRUE); @@ -931,14 +960,14 @@ { if (! isspace(*(buf + 10))) { - g_free(eol); + utils_free_pointers(eol, space, NULL); return; } - construct = g_strdup_printf("%s{%s\t%s}%s", eol, eol, eol, eol); + construct = g_strdup_printf("%s{%s%s%s}%s", eol, eol, space, eol, eol); SSM(sci, SCI_INSERTTEXT, pos, (sptr_t) construct); - sci_goto_pos(sci, pos + 4 + (2 * strlen(indent)), TRUE); + sci_goto_pos(sci, pos + 3 + space_len + (2 * strlen(indent)), TRUE); g_free(construct); } else if (! strncmp("for", buf + 12, 3)) @@ -948,7 +977,7 @@ if (! isspace(*(buf + 11))) { - g_free(eol); + utils_free_pointers(eol, space, NULL); return; } @@ -962,9 +991,9 @@ var = g_strdup("i"); contruct_len = 12; } - construct = g_strdup_printf("(%s%s = 0; %s < ; %s++)%s{%s\t%s}%s", + construct = g_strdup_printf("(%s%s = 0; %s < ; %s++)%s{%s%s%s}%s", (doc_list[idx].file_type->id == GEANY_FILETYPES_CPP) ? "int " : "", - var, var, var, eol, eol, eol, eol); + var, var, var, eol, eol, space, eol, eol); // add 4 characters because of "int " in C++ mode contruct_len += (doc_list[idx].file_type->id == GEANY_FILETYPES_CPP) ? 4 : 0; @@ -978,11 +1007,11 @@ { if (! isspace(*(buf + 9))) { - g_free(eol); + utils_free_pointers(eol, space, NULL); return; } - construct = g_strdup_printf("()%s{%s\t%s}%s", eol, eol, eol, eol); + construct = g_strdup_printf("()%s{%s%s%s}%s", eol, eol, space, eol, eol); SSM(sci, SCI_INSERTTEXT, pos, (sptr_t) construct); sci_goto_pos(sci, pos + 1, TRUE); @@ -992,40 +1021,41 @@ { if (! isspace(*(buf + 12))) { - g_free(eol); + utils_free_pointers(eol, space, NULL); return; } - construct = g_strdup_printf("%s{%s\t%s}%swhile ();%s", eol, eol, eol, eol, eol); + construct = g_strdup_printf("%s{%s%s%s}%swhile ();%s", eol, eol, space, eol, eol, eol); SSM(sci, SCI_INSERTTEXT, pos, (sptr_t) construct); - sci_goto_pos(sci, pos + 4 + (2 * strlen(indent)), TRUE); + sci_goto_pos(sci, pos + 3 + space_len + (2 * strlen(indent)), TRUE); g_free(construct); } else if (! strncmp("try", buf + 12, 3)) { if (! isspace(*(buf + 11))) { - g_free(eol); + utils_free_pointers(eol, space, NULL); return; } - construct = g_strdup_printf("%s{%s\t%s}%scatch ()%s{%s\t%s}%s", - eol, eol, eol, eol, eol, eol, eol, eol); + construct = g_strdup_printf("%s{%s%s%s}%scatch ()%s{%s%s%s}%s", + eol, eol, space, eol, eol, eol, eol, space, eol, eol); SSM(sci, SCI_INSERTTEXT, pos, (sptr_t) construct); - sci_goto_pos(sci, pos + 4 + (2 * strlen(indent)), TRUE); + sci_goto_pos(sci, pos + 3 + space_len + (2 * strlen(indent)), TRUE); g_free(construct); } else if (! strncmp("switch", buf + 9, 6)) { if (! isspace(*(buf + 8))) { - g_free(eol); + utils_free_pointers(eol, space, NULL); return; } - construct = g_strdup_printf("()%s{%s\tcase : break;%s\tdefault: %s}%s", eol, eol, eol, eol, eol); + construct = g_strdup_printf("()%s{%s%scase : break;%s%sdefault: %s}%s", + eol, eol, space, eol, space, eol, eol); SSM(sci, SCI_INSERTTEXT, pos, (sptr_t) construct); sci_goto_pos(sci, pos + 1, TRUE); @@ -1036,30 +1066,34 @@ if (doc_list[idx].file_type->id != GEANY_FILETYPES_FERITE || ! isspace(*(buf + 9))) { - g_free(eol); + utils_free_pointers(eol, space, NULL); return; } - construct = g_strdup_printf("%s{%s\t%s}%sfix%s{%s\t%s}%s", eol, eol, eol, eol, eol, eol, eol, eol); + construct = g_strdup_printf("%s{%s%s%s}%sfix%s{%s%s%s}%s", + eol, eol, space, eol, eol, eol, eol, space, eol, eol); SSM(sci, SCI_INSERTTEXT, pos, (sptr_t) construct); - sci_goto_pos(sci, pos + 4 + (2 * strlen(indent)), TRUE); + sci_goto_pos(sci, pos + 3 + space_len + (2 * strlen(indent)), TRUE); g_free(construct); } else if (doc_list[idx].file_type->id == GEANY_FILETYPES_FERITE && ! strncmp("monitor", buf + 8, 7)) { if (! isspace(*(buf + 7))) { - g_free(eol); + utils_free_pointers(eol, space, NULL); return; } - construct = g_strdup_printf("%s{%s\t%s}%shandle%s{%s\t%s}%s", eol, eol, eol, eol, eol, eol, eol, eol); + construct = g_strdup_printf("%s{%s%s%s}%shandle%s{%s%s%s}%s", + eol, eol, space, eol, eol, eol, eol, space, eol, eol); SSM(sci, SCI_INSERTTEXT, pos, (sptr_t) construct); - sci_goto_pos(sci, pos + 4 + (2 * strlen(indent)), TRUE); + sci_goto_pos(sci, pos + 3 + space_len + (2 * strlen(indent)), TRUE); g_free(construct); } + + utils_free_pointers(eol, space, NULL); } Modified: trunk/src/sciwrappers.c =================================================================== --- trunk/src/sciwrappers.c 2007-01-14 13:36:30 UTC (rev 1185) +++ trunk/src/sciwrappers.c 2007-01-14 17:09:17 UTC (rev 1186) @@ -917,3 +917,7 @@ SSM(sci, SCI_SETTABINDENTS, set, 0); } +void sci_set_use_tabs(ScintillaObject *sci, gboolean set) +{ + SSM(sci, SCI_SETUSETABS, set, 0); +} Modified: trunk/src/sciwrappers.h =================================================================== --- trunk/src/sciwrappers.h 2007-01-14 13:36:30 UTC (rev 1185) +++ trunk/src/sciwrappers.h 2007-01-14 17:09:17 UTC (rev 1186) @@ -1,7 +1,8 @@ /* * sciwrappers.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2005-2007 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -167,5 +168,6 @@ gint sci_get_overtype (ScintillaObject * sci); void sci_set_tab_indents (ScintillaObject * sci, gboolean set); +void sci_set_use_tabs (ScintillaObject * sci, gboolean set); #endif Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2007-01-14 13:36:30 UTC (rev 1185) +++ trunk/src/utils.c 2007-01-14 17:09:17 UTC (rev 1186) @@ -31,6 +31,7 @@ #include <unistd.h> #include <string.h> #include <errno.h> +#include <stdarg.h> #ifdef HAVE_SYS_STAT_H # include <sys/stat.h> @@ -1432,3 +1433,51 @@ } +/* Returns a string containing whitespace of the amount a according to the + * setting app->pref_editor_use_tabs filled with simple space characters or with the right amount + * of tabulator characters (a is filled with tabulators *and* spaces if a isn't a multiple of + * app->pref_editor_tab_width) */ +gchar *utils_get_whitespace(gint a) +{ + gchar *str; + + g_return_val_if_fail(a > 0, NULL); + + if (app->pref_editor_use_tabs) + { // first fill text with tabluators and fill the rest with spaces + gint tabs = a / app->pref_editor_tab_width; + gint spaces = a % app->pref_editor_tab_width; + gint len = tabs + spaces; + + str = g_malloc(len + 1); + + memset(str, '\t', tabs); + memset(str + tabs, ' ', spaces); + str[len] = '\0'; + } + else + str = g_strnfill(a, ' '); + + return str; +} + + +/* frees all passed pointers if they are non-NULL, the first argument is nothing special, + * it will also be freed, the list should be ended with NULL */ +void utils_free_pointers(gpointer first, ...) +{ + va_list a; + gpointer sa; + + for (va_start(a, first); (sa = va_arg(a, gpointer), sa!=NULL);) + { + if (sa != NULL) + g_free(sa); + } + va_end(a); + + if (first != NULL) + g_free(first); +} + + Modified: trunk/src/utils.h =================================================================== --- trunk/src/utils.h 2007-01-14 13:36:30 UTC (rev 1185) +++ trunk/src/utils.h 2007-01-14 17:09:17 UTC (rev 1186) @@ -1,7 +1,8 @@ /* * utils.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2005-2007 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -143,4 +144,14 @@ /* Simple wrapper for g_locale_to_utf8; returns a copy of locale_text on failure. */ gchar *utils_get_utf8_from_locale(const gchar *locale_text); +/* Returns a string containing whitespace of the amount a according to the + * setting app->pref_editor_use_tabs filled with simple space characters or with the right amount + * of tabulator characters (a is filled with tabulators *and* spaces if a isn't a multiple of + * app->pref_editor_tab_width) */ +gchar *utils_get_whitespace(gint amount); + +/* frees all passed pointers if they are non-NULL, the first argument is nothing special, + * it will also be freed, the list should be ended with NULL */ +void utils_free_pointers(gpointer first, ...); + #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: [1185] trunk/po/POTFILES.in
by eht16＠users.sourceforge.net 14 Jan '07

14 Jan '07

Revision: 1185 http://svn.sourceforge.net/geany/?rev=1185&view=rev Author: eht16 Date: 2007-01-14 05:36:30 -0800 (Sun, 14 Jan 2007) Log Message: ----------- Removed duplicate symbols.c and reordered the list alphabetically. Modified Paths: -------------- trunk/po/POTFILES.in Modified: trunk/po/POTFILES.in =================================================================== --- trunk/po/POTFILES.in 2007-01-14 12:45:29 UTC (rev 1184) +++ trunk/po/POTFILES.in 2007-01-14 13:36:30 UTC (rev 1185) @@ -1,33 +1,32 @@ # List of source files containing translatable strings. -src/main.c -src/interface.c +src/about.c +src/build.c src/callbacks.c -src/support.c src/dialogs.c src/document.c -src/utils.c -src/ui_utils.c +src/encodings.c src/filetypes.c +src/geany.h src/highlighting.c -src/win32.c -src/sci_cb.c -src/sciwrappers.c -src/keyfile.c src/images.c +src/interface.c +src/keybindings.c +src/keyfile.c +src/main.c src/msgwindow.c -src/build.c +src/notebook.c src/prefs.c -src/about.c -src/geany.h -src/templates.c -src/encodings.c -src/treeviews.c -src/vte.c -src/keybindings.c +src/sci_cb.c +src/sciwrappers.c src/search.c -src/notebook.c -src/symbols.c -src/tools.c src/socket.c +src/support.c src/symbols.c +src/templates.c +src/tools.c +src/treeviews.c +src/ui_utils.c +src/utils.c +src/vte.c +src/win32.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1184] trunk
by ntrel＠users.sourceforge.net 14 Jan '07

14 Jan '07

Revision: 1184 http://svn.sourceforge.net/geany/?rev=1184&view=rev Author: ntrel Date: 2007-01-14 04:45:29 -0800 (Sun, 14 Jan 2007) Log Message: ----------- Fix segfault when setting Lua filetype. Modified Paths: -------------- trunk/ChangeLog trunk/src/highlighting.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-01-14 12:12:18 UTC (rev 1183) +++ trunk/ChangeLog 2007-01-14 12:45:29 UTC (rev 1184) @@ -3,6 +3,8 @@ * src/treeviews.c, src/treeviews.h, src/symbols.c, po/POTFILES.in: Move treeviews_init_tag_list() and symbol list GtkTreeIters to symbols.c. + * src/highlighting.c: + Fix segfault when setting Lua filetype. 2007-01-13 Enrico Tröger <enrico.troeger(a)uvena.de> Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2007-01-14 12:12:18 UTC (rev 1183) +++ trunk/src/highlighting.c 2007-01-14 12:45:29 UTC (rev 1184) @@ -2899,7 +2899,7 @@ SSM(sci, SCI_SETKEYWORDS, 6, (sptr_t) style_sets[GEANY_FILETYPES_LUA].keywords[6]); SSM(sci, SCI_SETKEYWORDS, 7, (sptr_t) style_sets[GEANY_FILETYPES_LUA].keywords[7]); - set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_VHDL, 0); + set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_LUA, 0); set_sci_style(sci, SCE_LUA_DEFAULT, GEANY_FILETYPES_LUA, 0); set_sci_style(sci, SCE_LUA_COMMENT, GEANY_FILETYPES_LUA, 1); set_sci_style(sci, SCE_LUA_COMMENTLINE, GEANY_FILETYPES_LUA, 2); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1183] trunk
by ntrel＠users.sourceforge.net 14 Jan '07

14 Jan '07

Revision: 1183 http://svn.sourceforge.net/geany/?rev=1183&view=rev Author: ntrel Date: 2007-01-14 04:12:18 -0800 (Sun, 14 Jan 2007) Log Message: ----------- Move treeviews_init_tag_list() and symbol list GtkTreeIters to symbols.c. Modified Paths: -------------- trunk/ChangeLog trunk/po/POTFILES.in trunk/src/symbols.c trunk/src/treeviews.c trunk/src/treeviews.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-01-13 20:50:36 UTC (rev 1182) +++ trunk/ChangeLog 2007-01-14 12:12:18 UTC (rev 1183) @@ -1,3 +1,10 @@ +2007-01-14 Nick Treleaven <nick.treleaven(a)btinternet.com> + + * src/treeviews.c, src/treeviews.h, src/symbols.c, po/POTFILES.in: + Move treeviews_init_tag_list() and symbol list GtkTreeIters to + symbols.c. + + 2007-01-13 Enrico Tröger <enrico.troeger(a)uvena.de> * data/filetype_extensions.conf, data/filetypes.javascript, Modified: trunk/po/POTFILES.in =================================================================== --- trunk/po/POTFILES.in 2007-01-13 20:50:36 UTC (rev 1182) +++ trunk/po/POTFILES.in 2007-01-14 12:12:18 UTC (rev 1183) @@ -30,3 +30,4 @@ src/symbols.c src/tools.c src/socket.c +src/symbols.c Modified: trunk/src/symbols.c =================================================================== --- trunk/src/symbols.c 2007-01-13 20:50:36 UTC (rev 1182) +++ trunk/src/symbols.c 2007-01-14 12:12:18 UTC (rev 1183) @@ -31,7 +31,7 @@ #include "filetypes.h" #include "encodings.h" #include "document.h" -#include "treeviews.h" +#include "support.h" const guint TM_GLOBAL_TYPE_MASK = @@ -353,6 +353,211 @@ } +struct TreeviewSymbols +{ + GtkTreeIter tag_function; + GtkTreeIter tag_class; + GtkTreeIter tag_macro; + GtkTreeIter tag_member; + GtkTreeIter tag_variable; + GtkTreeIter tag_namespace; + GtkTreeIter tag_struct; + GtkTreeIter tag_other; +} tv_iters; + +static void init_tag_list(gint idx) +{ + // init all GtkTreeIters with -1 to make them invalid to avoid crashes when switching between + // filetypes(e.g. config file to Python crashes Geany without this) + tv_iters.tag_function.stamp = -1; + tv_iters.tag_class.stamp = -1; + tv_iters.tag_member.stamp = -1; + tv_iters.tag_macro.stamp = -1; + tv_iters.tag_variable.stamp = -1; + tv_iters.tag_namespace.stamp = -1; + tv_iters.tag_struct.stamp = -1; + tv_iters.tag_other.stamp = -1; + + switch (doc_list[idx].file_type->id) + { + case GEANY_FILETYPES_DIFF: + { + gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_function), NULL); + gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_function), 0, _("Files"), -1); + break; + } + case GEANY_FILETYPES_DOCBOOK: + { + gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_function), NULL); + gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_function), 0, _("Chapter"), -1); + gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_class), NULL); + gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_class), 0, _("Section"), -1); + gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_member), NULL); + gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_member), 0, _("Sect1"), -1); + gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_macro), NULL); + gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_macro), 0, _("Sect2"), -1); + gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_variable), NULL); + gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_variable), 0, _("Sect3"), -1); + gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_struct), NULL); + gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_struct), 0, _("Appendix"), -1); + gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_other), NULL); + gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_other), 0, _("Other"), -1); + //gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_namespace), NULL); + //gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_namespace), 0, _("Other"), -1); + break; + } + case GEANY_FILETYPES_LATEX: + { + gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_function), NULL); + gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_function), 0, _("Command"), -1); + gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_class), NULL); + gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_class), 0, _("Environment"), -1); + gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_member), NULL); + gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_member), 0, _("Section"), -1); + gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_macro), NULL); + gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_macro), 0, _("Subsection"), -1); + gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_variable), NULL); + gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_variable), 0, _("Subsubsection"), -1); + gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_struct), NULL); + gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_struct), 0, _("Label"), -1); + gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_namespace), NULL); + gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_namespace), 0, _("Chapter"), -1); + gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_other), NULL); + gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_other), 0, _("Other"), -1); + break; + } + case GEANY_FILETYPES_PERL: + { + gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_function), NULL); + gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_function), 0, _("Function"), -1); + gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_class), NULL); + gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_class), 0, _("Package"), -1); + gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_member), NULL); + gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_member), 0, _("My"), -1); + gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_macro), NULL); + gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_macro), 0, _("Local"), -1); + gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_variable), NULL); + gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_variable), 0, _("Our"), -1); +/* gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_struct), NULL); + gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_struct), 0, _("Label"), -1); + gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_namespace), NULL); + gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_namespace), 0, _("Begin"), -1); + gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_other), NULL); + gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_other), 0, _("Other"), -1); +*/ + break; + } + case GEANY_FILETYPES_RUBY: + { + gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_function), NULL); + gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_function), 0, _("Methods"), -1); + gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_class), NULL); + gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_class), 0, _("Classes"), -1); + gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_member), NULL); + gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_member), 0, _("Singletons"), -1); + gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_macro), NULL); + gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_macro), 0, _("Mixins"), -1); + gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_variable), NULL); + gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_variable), 0, _("Variables"), -1); + gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_struct), NULL); + gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_struct), 0, _("Members"), -1); +/* gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_namespace), NULL); + gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_namespace), 0, _("Begin"), -1); + gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_other), NULL); + gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_other), 0, _("Other"), -1); +*/ + break; + } + case GEANY_FILETYPES_PYTHON: + { + gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_function), NULL); + gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_function), 0, _("Functions"), -1); + gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_class), NULL); + gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_class), 0, _("Classes"), -1); + gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_member), NULL); + gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_member), 0, _("Methods"), -1); +/* gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_macro), NULL); + gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_macro), 0, _("Mixin"), -1); + gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_variable), NULL); + gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_variable), 0, _("Variables"), -1); + gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_struct), NULL); + gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_struct), 0, _("Members"), -1); + gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_namespace), NULL); + gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_namespace), 0, _("Begin"), -1); + gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_other), NULL); + gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_other), 0, _("Other"), -1); +*/ + break; + } + case GEANY_FILETYPES_JAVA: + case GEANY_FILETYPES_D: + { + // use singular because one file can only belong to one Package / Module + gchar *namespace_name = (doc_list[idx].file_type->id == GEANY_FILETYPES_D) ? + _("Module") : _("Package"); + + gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_function), NULL); + gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_function), 0, _("Methods"), -1); + gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_class), NULL); + gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_class), 0, _("Classes"), -1); + gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_struct), NULL); + gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_struct), 0, _("Interfaces"), -1); + gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_member), NULL); + gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_member), 0, _("Members"), -1); + //gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_macro), NULL); + //gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_macro), 0, _("Macros"), -1); + //gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_variable), NULL); + //gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_variable), 0, _("Variables"), -1); + gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_namespace), NULL); + gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_namespace), 0, namespace_name, -1); + gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_other), NULL); + gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_other), 0, _("Other"), -1); + break; + } + case GEANY_FILETYPES_VHDL: + { + gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_function), NULL); + gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_function), 0, _("Functions"), -1); +/* gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_class), NULL); + gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_class), 0, _("Constants"), -1); + gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_member), NULL); + gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_member), 0, _("Members"), -1); + gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_macro), NULL); + gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_macro), 0, _("Macros"), -1); +*/ gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_variable), NULL); + gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_variable), 0, _("Variables"), -1); +/* gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_namespace), NULL); + gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_namespace), 0, _("Namespaces"), -1); + gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_struct), NULL); + gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_struct), 0, _("Signals"), -1); + gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_other), NULL); + gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_other), 0, _("Other"), -1); +*/ + break; + } + default: + { + gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_function), NULL); + gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_function), 0, _("Functions"), -1); + gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_class), NULL); + gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_class), 0, _("Classes"), -1); + gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_member), NULL); + gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_member), 0, _("Members"), -1); + gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_macro), NULL); + gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_macro), 0, _("Macros"), -1); + gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_variable), NULL); + gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_variable), 0, _("Variables"), -1); + gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_namespace), NULL); + gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_namespace), 0, _("Namespaces"), -1); + gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_struct), NULL); + gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_struct), 0, _("Structs / Typedefs"), -1); + gtk_tree_store_append(doc_list[idx].tag_store, &(tv_iters.tag_other), NULL); + gtk_tree_store_set(doc_list[idx].tag_store, &(tv_iters.tag_other), 0, _("Other"), -1); + } + } +} + + gboolean symbols_recreate_tag_list(gint idx) { GList *tmp; @@ -369,41 +574,43 @@ g_object_ref(model); // Make sure the model stays with us after the tree view unrefs it gtk_tree_view_set_model(GTK_TREE_VIEW(doc_list[idx].tag_tree), NULL); // Detach model from view - treeviews_init_tag_list(idx); + init_tag_list(idx); for (tmp = (GList*)tags; tmp; tmp = g_list_next(tmp)) { - switch (((GeanySymbol*)tmp->data)->type) + const GeanySymbol *symbol = (GeanySymbol*)tmp->data; + + switch (symbol->type) { case tm_tag_prototype_t: case tm_tag_method_t: case tm_tag_function_t: { - if (tv.tag_function.stamp == -1) break; - gtk_tree_store_append(doc_list[idx].tag_store, &iter, &(tv.tag_function)); - gtk_tree_store_set(doc_list[idx].tag_store, &iter, 0, ((GeanySymbol*)tmp->data)->str, -1); + if (tv_iters.tag_function.stamp == -1) break; + gtk_tree_store_append(doc_list[idx].tag_store, &iter, &(tv_iters.tag_function)); + gtk_tree_store_set(doc_list[idx].tag_store, &iter, 0, symbol->str, -1); break; } case tm_tag_macro_t: case tm_tag_macro_with_arg_t: { - if (tv.tag_macro.stamp == -1) break; - gtk_tree_store_append(doc_list[idx].tag_store, &iter, &(tv.tag_macro)); - gtk_tree_store_set(doc_list[idx].tag_store, &iter, 0, ((GeanySymbol*)tmp->data)->str, -1); + if (tv_iters.tag_macro.stamp == -1) break; + gtk_tree_store_append(doc_list[idx].tag_store, &iter, &(tv_iters.tag_macro)); + gtk_tree_store_set(doc_list[idx].tag_store, &iter, 0, symbol->str, -1); break; } case tm_tag_class_t: { - if (tv.tag_class.stamp == -1) break; - gtk_tree_store_append(doc_list[idx].tag_store, &iter, &(tv.tag_class)); - gtk_tree_store_set(doc_list[idx].tag_store, &iter, 0, ((GeanySymbol*)tmp->data)->str, -1); + if (tv_iters.tag_class.stamp == -1) break; + gtk_tree_store_append(doc_list[idx].tag_store, &iter, &(tv_iters.tag_class)); + gtk_tree_store_set(doc_list[idx].tag_store, &iter, 0, symbol->str, -1); break; } case tm_tag_member_t: case tm_tag_field_t: { - if (tv.tag_member.stamp == -1) break; - gtk_tree_store_append(doc_list[idx].tag_store, &iter, &(tv.tag_member)); - gtk_tree_store_set(doc_list[idx].tag_store, &iter, 0, ((GeanySymbol*)tmp->data)->str, -1); + if (tv_iters.tag_member.stamp == -1) break; + gtk_tree_store_append(doc_list[idx].tag_store, &iter, &(tv_iters.tag_member)); + gtk_tree_store_set(doc_list[idx].tag_store, &iter, 0, symbol->str, -1); break; } case tm_tag_typedef_t: @@ -412,31 +619,31 @@ case tm_tag_struct_t: case tm_tag_interface_t: { - if (tv.tag_struct.stamp == -1) break; - gtk_tree_store_append(doc_list[idx].tag_store, &iter, &(tv.tag_struct)); - gtk_tree_store_set(doc_list[idx].tag_store, &iter, 0, ((GeanySymbol*)tmp->data)->str, -1); + if (tv_iters.tag_struct.stamp == -1) break; + gtk_tree_store_append(doc_list[idx].tag_store, &iter, &(tv_iters.tag_struct)); + gtk_tree_store_set(doc_list[idx].tag_store, &iter, 0, symbol->str, -1); break; } case tm_tag_variable_t: { - if (tv.tag_variable.stamp == -1) break; - gtk_tree_store_append(doc_list[idx].tag_store, &iter, &(tv.tag_variable)); - gtk_tree_store_set(doc_list[idx].tag_store, &iter, 0, ((GeanySymbol*)tmp->data)->str, -1); + if (tv_iters.tag_variable.stamp == -1) break; + gtk_tree_store_append(doc_list[idx].tag_store, &iter, &(tv_iters.tag_variable)); + gtk_tree_store_set(doc_list[idx].tag_store, &iter, 0, symbol->str, -1); break; } case tm_tag_namespace_t: case tm_tag_package_t: { - if (tv.tag_namespace.stamp == -1) break; - gtk_tree_store_append(doc_list[idx].tag_store, &iter, &(tv.tag_namespace)); - gtk_tree_store_set(doc_list[idx].tag_store, &iter, 0, ((GeanySymbol*)tmp->data)->str, -1); + if (tv_iters.tag_namespace.stamp == -1) break; + gtk_tree_store_append(doc_list[idx].tag_store, &iter, &(tv_iters.tag_namespace)); + gtk_tree_store_set(doc_list[idx].tag_store, &iter, 0, symbol->str, -1); break; } default: { - if (tv.tag_other.stamp == -1) break; - gtk_tree_store_append(doc_list[idx].tag_store, &iter, &(tv.tag_other)); - gtk_tree_store_set(doc_list[idx].tag_store, &iter, 0, ((GeanySymbol*)tmp->data)->str, -1); + if (tv_iters.tag_other.stamp == -1) break; + gtk_tree_store_append(doc_list[idx].tag_store, &iter, &(tv_iters.tag_other)); + gtk_tree_store_set(doc_list[idx].tag_store, &iter, 0, symbol->str, -1); } } } Modified: trunk/src/treeviews.c =================================================================== --- trunk/src/treeviews.c 2007-01-13 20:50:36 UTC (rev 1182) +++ trunk/src/treeviews.c 2007-01-14 12:12:18 UTC (rev 1183) @@ -90,199 +90,6 @@ } -void treeviews_init_tag_list(gint idx) -{ - // init all GtkTreeIters with -1 to make them invalid to avoid crashes when switching between - // filetypes(e.g. config file to Python crashes Geany without this) - tv.tag_function.stamp = -1; - tv.tag_class.stamp = -1; - tv.tag_member.stamp = -1; - tv.tag_macro.stamp = -1; - tv.tag_variable.stamp = -1; - tv.tag_namespace.stamp = -1; - tv.tag_struct.stamp = -1; - tv.tag_other.stamp = -1; - - 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); - gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_function), 0, _("Chapter"), -1); - gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_class), NULL); - gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_class), 0, _("Section"), -1); - gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_member), NULL); - gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_member), 0, _("Sect1"), -1); - gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_macro), NULL); - gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_macro), 0, _("Sect2"), -1); - gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_variable), NULL); - gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_variable), 0, _("Sect3"), -1); - gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_struct), NULL); - gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_struct), 0, _("Appendix"), -1); - gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_other), NULL); - gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_other), 0, _("Other"), -1); - //gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_namespace), NULL); - //gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_namespace), 0, _("Other"), -1); - break; - } - case GEANY_FILETYPES_LATEX: - { - 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, _("Command"), -1); - gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_class), NULL); - gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_class), 0, _("Environment"), -1); - gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_member), NULL); - gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_member), 0, _("Section"), -1); - gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_macro), NULL); - gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_macro), 0, _("Subsection"), -1); - gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_variable), NULL); - gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_variable), 0, _("Subsubsection"), -1); - gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_struct), NULL); - gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_struct), 0, _("Label"), -1); - gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_namespace), NULL); - gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_namespace), 0, _("Chapter"), -1); - gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_other), NULL); - gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_other), 0, _("Other"), -1); - break; - } - case GEANY_FILETYPES_PERL: - { - 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, _("Function"), -1); - gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_class), NULL); - gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_class), 0, _("Package"), -1); - gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_member), NULL); - gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_member), 0, _("My"), -1); - gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_macro), NULL); - gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_macro), 0, _("Local"), -1); - gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_variable), NULL); - gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_variable), 0, _("Our"), -1); -/* gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_struct), NULL); - gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_struct), 0, _("Label"), -1); - gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_namespace), NULL); - gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_namespace), 0, _("Begin"), -1); - gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_other), NULL); - gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_other), 0, _("Other"), -1); -*/ - break; - } - case GEANY_FILETYPES_RUBY: - { - 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, _("Methods"), -1); - gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_class), NULL); - gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_class), 0, _("Classes"), -1); - gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_member), NULL); - gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_member), 0, _("Singletons"), -1); - gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_macro), NULL); - gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_macro), 0, _("Mixins"), -1); - gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_variable), NULL); - gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_variable), 0, _("Variables"), -1); - gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_struct), NULL); - gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_struct), 0, _("Members"), -1); -/* gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_namespace), NULL); - gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_namespace), 0, _("Begin"), -1); - gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_other), NULL); - gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_other), 0, _("Other"), -1); -*/ - break; - } - case GEANY_FILETYPES_PYTHON: - { - 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, _("Functions"), -1); - gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_class), NULL); - gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_class), 0, _("Classes"), -1); - gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_member), NULL); - gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_member), 0, _("Methods"), -1); -/* gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_macro), NULL); - gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_macro), 0, _("Mixin"), -1); - gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_variable), NULL); - gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_variable), 0, _("Variables"), -1); - gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_struct), NULL); - gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_struct), 0, _("Members"), -1); - gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_namespace), NULL); - gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_namespace), 0, _("Begin"), -1); - gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_other), NULL); - gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_other), 0, _("Other"), -1); -*/ - break; - } - case GEANY_FILETYPES_JAVA: - case GEANY_FILETYPES_D: - { - // use singular because one file can only belong to one Package / Module - gchar *namespace_name = (doc_list[idx].file_type->id == GEANY_FILETYPES_D) ? - _("Module") : _("Package"); - - 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, _("Methods"), -1); - gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_class), NULL); - gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_class), 0, _("Classes"), -1); - gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_struct), NULL); - gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_struct), 0, _("Interfaces"), -1); - gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_member), NULL); - gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_member), 0, _("Members"), -1); - //gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_macro), NULL); - //gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_macro), 0, _("Macros"), -1); - //gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_variable), NULL); - //gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_variable), 0, _("Variables"), -1); - gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_namespace), NULL); - gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_namespace), 0, namespace_name, -1); - gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_other), NULL); - gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_other), 0, _("Other"), -1); - break; - } - case GEANY_FILETYPES_VHDL: - { - 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, _("Functions"), -1); -/* gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_class), NULL); - gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_class), 0, _("Constants"), -1); - gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_member), NULL); - gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_member), 0, _("Members"), -1); - gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_macro), NULL); - gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_macro), 0, _("Macros"), -1); -*/ gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_variable), NULL); - gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_variable), 0, _("Variables"), -1); -/* gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_namespace), NULL); - gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_namespace), 0, _("Namespaces"), -1); - gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_struct), NULL); - gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_struct), 0, _("Signals"), -1); - gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_other), NULL); - gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_other), 0, _("Other"), -1); -*/ - break; - } - default: - { - 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, _("Functions"), -1); - gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_class), NULL); - gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_class), 0, _("Classes"), -1); - gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_member), NULL); - gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_member), 0, _("Members"), -1); - gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_macro), NULL); - gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_macro), 0, _("Macros"), -1); - gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_variable), NULL); - gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_variable), 0, _("Variables"), -1); - gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_namespace), NULL); - gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_namespace), 0, _("Namespaces"), -1); - gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_struct), NULL); - gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_struct), 0, _("Structs / Typedefs"), -1); - gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_other), NULL); - gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_other), 0, _("Other"), -1); - } - } -} - - /* does some preparing things to the open files list widget */ void treeviews_prepare_openfiles() { Modified: trunk/src/treeviews.h =================================================================== --- trunk/src/treeviews.h 2007-01-13 20:50:36 UTC (rev 1182) +++ trunk/src/treeviews.h 2007-01-14 12:12:18 UTC (rev 1183) @@ -26,32 +26,17 @@ #define GEANY_TREEVIEWS_H 1 - -typedef struct treeviews { +struct SidebarTreeviews +{ GtkListStore *store_openfiles; GtkWidget *tree_openfiles; GtkWidget *popup_taglist; GtkWidget *popup_openfiles; - GtkTreeIter tag_function; - GtkTreeIter tag_class; - GtkTreeIter tag_macro; - GtkTreeIter tag_member; - GtkTreeIter tag_variable; - GtkTreeIter tag_namespace; - GtkTreeIter tag_struct; - GtkTreeIter tag_other; -} treeviews; +} tv; -treeviews tv; - - void treeviews_prepare_taglist(GtkWidget *tree, GtkTreeStore *store); -gint treeviews_sort_tag_list(GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpointer user_data); - -void treeviews_init_tag_list(gint idx); - void treeviews_prepare_openfiles(); void treeviews_openfiles_add(gint idx); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1182] trunk
by eht16＠users.sourceforge.net 13 Jan '07

13 Jan '07

Revision: 1182 http://svn.sourceforge.net/geany/?rev=1182&view=rev Author: eht16 Date: 2007-01-13 12:50:36 -0800 (Sat, 13 Jan 2007) Log Message: ----------- Applied patch from Jeff Pohlmeyer to add an option for disabling DnD in the editor widget. Modified Paths: -------------- trunk/ChangeLog trunk/THANKS trunk/geany.glade trunk/src/geany.h trunk/src/interface.c trunk/src/keyfile.c trunk/src/prefs.c trunk/src/sci_cb.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-01-13 20:16:09 UTC (rev 1181) +++ trunk/ChangeLog 2007-01-13 20:50:36 UTC (rev 1182) @@ -7,6 +7,10 @@ src/sci_cb.c, src/templates.c, tagmanager/js.c, tagmanager/lua.c, tagmanager/Makefile.am, tagmanager/makefile.win32, tagmanager/parsers.h: Added new filetypes Javascript and Lua. + * geany.glade, THANKS, src/geany.h, src/interface.c, src/keyfile.c, + src/prefs.c, src/sci_cb.c: + Applied patch from Jeff Pohlmeyer to add an option for disabling DnD + in the editor widget. 2007-01-13 Nick Treleaven <nick.treleaven(a)btinternet.com> Modified: trunk/THANKS =================================================================== --- trunk/THANKS 2007-01-13 20:16:09 UTC (rev 1181) +++ trunk/THANKS 2007-01-13 20:50:36 UTC (rev 1182) @@ -21,6 +21,7 @@ Bob Doan <bdoan(at)sicom(dot)com> - some patches Rob van der Linde <robvdl(at)paradise(dot)net(dot)nz> - fixed wrong vte height on some systems Josef Whiter <josef(at)toxicpanda(dot)com> - parse 'Entering directory' build messages. +Jeff Pohlmeyer <yetanothergeek(at)gmail(dot)com> - "Allow DnD" and "Use tabs" patches Translators: ---------------------------------- Modified: trunk/geany.glade =================================================================== --- trunk/geany.glade 2007-01-13 20:16:09 UTC (rev 1181) +++ trunk/geany.glade 2007-01-13 20:50:36 UTC (rev 1182) @@ -5217,6 +5217,26 @@ <property name="fill">False</property> </packing> </child> + + <child> + <widget class="GtkCheckButton" id="check_disable_dnd"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Disable drag and drop completely in the editor window so you can't drag and drop any selections within or outside of the editor window.</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Disable Drag and Drop</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">False</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> </widget> </child> </widget> Modified: trunk/src/geany.h =================================================================== --- trunk/src/geany.h 2007-01-13 20:16:09 UTC (rev 1181) +++ trunk/src/geany.h 2007-01-13 20:50:36 UTC (rev 1182) @@ -114,6 +114,7 @@ gboolean pref_editor_new_line; gboolean pref_editor_replace_tabs; gboolean pref_editor_trail_space; + gboolean pref_editor_disable_dnd; gboolean pref_main_load_session; gboolean pref_main_save_winpos; gboolean pref_main_confirm_exit; Modified: trunk/src/interface.c =================================================================== --- trunk/src/interface.c 2007-01-13 20:16:09 UTC (rev 1181) +++ trunk/src/interface.c 2007-01-13 20:50:36 UTC (rev 1182) @@ -2303,6 +2303,7 @@ GtkWidget *check_folding; GtkWidget *check_unfold_children; GtkWidget *check_indicators; + GtkWidget *check_disable_dnd; GtkWidget *label172; GtkWidget *frame18; GtkWidget *alignment21; @@ -3195,6 +3196,12 @@ gtk_tooltips_set_tip (tooltips, check_indicators, _("Whether to use indicators (a squiggly underline) to highlight the lines where the compiler found a warning or an error."), NULL); gtk_button_set_focus_on_click (GTK_BUTTON (check_indicators), FALSE); + check_disable_dnd = gtk_check_button_new_with_mnemonic (_("Disable Drag and Drop")); + gtk_widget_show (check_disable_dnd); + gtk_box_pack_start (GTK_BOX (vbox17), check_disable_dnd, FALSE, FALSE, 0); + gtk_tooltips_set_tip (tooltips, check_disable_dnd, _("Disable drag and drop completely in the editor window so you can't drag and drop any selections within or outside of the editor window."), NULL); + gtk_button_set_focus_on_click (GTK_BUTTON (check_disable_dnd), FALSE); + label172 = gtk_label_new (_("Features")); gtk_widget_show (label172); gtk_frame_set_label_widget (GTK_FRAME (frame14), label172); @@ -3725,6 +3732,7 @@ GLADE_HOOKUP_OBJECT (prefs_dialog, check_folding, "check_folding"); GLADE_HOOKUP_OBJECT (prefs_dialog, check_unfold_children, "check_unfold_children"); GLADE_HOOKUP_OBJECT (prefs_dialog, check_indicators, "check_indicators"); + GLADE_HOOKUP_OBJECT (prefs_dialog, check_disable_dnd, "check_disable_dnd"); GLADE_HOOKUP_OBJECT (prefs_dialog, label172, "label172"); GLADE_HOOKUP_OBJECT (prefs_dialog, frame18, "frame18"); GLADE_HOOKUP_OBJECT (prefs_dialog, alignment21, "alignment21"); Modified: trunk/src/keyfile.c =================================================================== --- trunk/src/keyfile.c 2007-01-13 20:16:09 UTC (rev 1181) +++ trunk/src/keyfile.c 2007-01-13 20:50:36 UTC (rev 1182) @@ -173,6 +173,7 @@ g_key_file_set_boolean(config, PACKAGE, "pref_editor_new_line", app->pref_editor_new_line); g_key_file_set_boolean(config, PACKAGE, "pref_editor_replace_tabs", app->pref_editor_replace_tabs); g_key_file_set_boolean(config, PACKAGE, "pref_editor_trail_space", app->pref_editor_trail_space); + g_key_file_set_boolean(config, PACKAGE, "pref_editor_disable_dnd", app->pref_editor_disable_dnd); g_key_file_set_string(config, PACKAGE, "pref_editor_default_encoding", encodings[app->pref_editor_default_encoding].charset); g_key_file_set_string(config, PACKAGE, "pref_template_developer", app->pref_template_developer); g_key_file_set_string(config, PACKAGE, "pref_template_company", app->pref_template_company); @@ -429,6 +430,7 @@ app->pref_editor_replace_tabs = utils_get_setting_boolean(config, PACKAGE, "pref_editor_replace_tabs", FALSE); app->pref_editor_new_line = utils_get_setting_boolean(config, PACKAGE, "pref_editor_new_line", TRUE); app->pref_editor_trail_space = utils_get_setting_boolean(config, PACKAGE, "pref_editor_trail_space", FALSE); + app->pref_editor_disable_dnd = utils_get_setting_boolean(config, PACKAGE, "pref_editor_disable_dnd", FALSE); tmp_string = g_find_program_in_path(GEANY_DEFAULT_TOOLS_MAKE); app->tools_make_cmd = utils_get_setting_string(config, "tools", "make_cmd", tmp_string); Modified: trunk/src/prefs.c =================================================================== --- trunk/src/prefs.c 2007-01-13 20:16:09 UTC (rev 1181) +++ trunk/src/prefs.c 2007-01-13 20:50:36 UTC (rev 1182) @@ -247,6 +247,9 @@ on_pref_use_folding_toggled(GTK_TOGGLE_BUTTON( lookup_widget(app->prefs_dialog, "check_folding")), NULL); + widget = lookup_widget(app->prefs_dialog, "check_disable_dnd"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), app->pref_editor_disable_dnd); + widget = lookup_widget(app->prefs_dialog, "check_indicators"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), app->pref_editor_use_indicators); @@ -550,6 +553,9 @@ widget = lookup_widget(app->prefs_dialog, "check_indicators"); app->pref_editor_use_indicators = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + widget = lookup_widget(app->prefs_dialog, "check_disable_dnd"); + app->pref_editor_disable_dnd = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + widget = lookup_widget(app->prefs_dialog, "spin_autocheight"); app->autocompletion_max_height = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget)); Modified: trunk/src/sci_cb.c =================================================================== --- trunk/src/sci_cb.c 2007-01-13 20:16:09 UTC (rev 1181) +++ trunk/src/sci_cb.c 2007-01-13 20:50:36 UTC (rev 1182) @@ -67,6 +67,11 @@ if (event->button == 1) { + if (GDK_BUTTON_PRESS==event->type && app->pref_editor_disable_dnd) + { + gint ss = sci_get_selection_start(doc_list[idx].sci); + sci_set_selection_end(doc_list[idx].sci, ss); + } return utils_check_disk_status(idx, FALSE); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1181] trunk
by eht16＠users.sourceforge.net 13 Jan '07

13 Jan '07

Revision: 1181 http://svn.sourceforge.net/geany/?rev=1181&view=rev Author: eht16 Date: 2007-01-13 12:16:09 -0800 (Sat, 13 Jan 2007) Log Message: ----------- Added new filetypes Javascript and Lua. Modified Paths: -------------- trunk/ChangeLog trunk/data/filetype_extensions.conf trunk/scintilla/KeyWords.cxx trunk/scintilla/Makefile.am trunk/scintilla/makefile.win32 trunk/src/filetypes.c trunk/src/filetypes.h trunk/src/highlighting.c trunk/src/highlighting.h trunk/src/sci_cb.c trunk/src/templates.c trunk/tagmanager/Makefile.am trunk/tagmanager/makefile.win32 trunk/tagmanager/parsers.h Added Paths: ----------- trunk/data/filetypes.javascript trunk/data/filetypes.lua trunk/scintilla/LexLua.cxx trunk/tagmanager/js.c trunk/tagmanager/lua.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-01-13 15:25:45 UTC (rev 1180) +++ trunk/ChangeLog 2007-01-13 20:16:09 UTC (rev 1181) @@ -1,3 +1,14 @@ +2007-01-13 Enrico Tröger <enrico.troeger(a)uvena.de> + + * data/filetype_extensions.conf, data/filetypes.javascript, + data/filetypes.lua, scintilla/KeyWords.cxx, scintilla/LexLua.cxx, + scintilla/Makefile.am, scintilla/makefile.win32, src/filetypes.c, + src/filetypes.h, src/highlighting.c, src/highlighting.h, + src/sci_cb.c, src/templates.c, tagmanager/js.c, tagmanager/lua.c, + tagmanager/Makefile.am, tagmanager/makefile.win32, + tagmanager/parsers.h: Added new filetypes Javascript and Lua. + + 2007-01-13 Nick Treleaven <nick.treleaven(a)btinternet.com> * src/main.c, src/socket.c, po/POTFILES.in: Modified: trunk/data/filetype_extensions.conf =================================================================== --- trunk/data/filetype_extensions.conf 2007-01-13 15:25:45 UTC (rev 1180) +++ trunk/data/filetype_extensions.conf 2007-01-13 20:16:09 UTC (rev 1181) @@ -12,9 +12,11 @@ CAML=*.ml;*.mli; Perl=*.pl;*.perl;*.pm;*.agi; PHP=*.php;*.php3;*.php4;*.php5;*.phtml; +Javascript=*.js;*.jsp; Python=*.py;*.pyw; Ruby=*.rb;*.rhtml; Tcl=*.tcl;*.tk;*.wish; +Lua=*.lua; Ferite=*.fe; Sh=*.sh;configure;configure.in;configure.in.in;configure.ac;*.ksh;*.zsh; Make=*.mak;*.mk;GNUmakefile;makefile;Makefile;makefile.*;Makefile.*; Added: trunk/data/filetypes.javascript =================================================================== --- trunk/data/filetypes.javascript (rev 0) +++ trunk/data/filetypes.javascript 2007-01-13 20:16:09 UTC (rev 1181) @@ -0,0 +1,52 @@ +# 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 + +[keywords] +# all items must be in one line +primary=abstract boolean break byte case catch char class const continue debugger default delete do double else enum export extends final finally float for function goto if implements import in instanceof int interface long native new package private protected public return short static super switch synchronized this throw throws transient try typeof var void volatile while with + +[settings] +# 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= + +# set to false if a comment character/string should start at column 0 of a line, true uses any +# indention 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 + +[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= +run= + + Added: trunk/data/filetypes.lua =================================================================== --- trunk/data/filetypes.lua (rev 0) +++ trunk/data/filetypes.lua 2007-01-13 20:16:09 UTC (rev 1181) @@ -0,0 +1,65 @@ +# 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;true;false +number=0x007f00;0xffffff;false;false +word=0x00007f;0xffffff;true;false +string=0xff901e;0xffffff;false;false +character=0x008000;0xffffff;false;false +literalstring=0x008020;0xffffff;false;false +preprocessor=0x007f7f;0xffffff;false;false +operator=0x301010;0xffffff;false;false +identifier=0x000000;0xffffff;false;false +stringeol=0x000000;0xe0c0e0;false;false +function_basic=0x991111;0xffffff;false;false +function_other=0x690000;0xffffff;false;false +coroutines=0x66005c;0xffffff;false;false +word5=0x7979ff;0xffffff;false;false +word6=0xad00ff;0xffffff;false;false +word7=0x03D000;0xffffff;false;false +word8=0xff7600;0xffffff;false;false + +[keywords] +# all items must be in one line +keywords=and break do else elseif end false for function if in local nil not or repeat return then true until while +# Basic functions +function_basic=_ALERT assert call collectgarbage coroutine debug dofile dostring error _ERRORMESSAGE foreach foreachi _G gcinfo getfenv getmetatable getn globals _INPUT io ipairs load loadfile loadlib loadstring math module newtype next os _OUTPUT pairs pcall print _PROMPT rawequal rawget rawset require select setfenv setmetatable sort _STDERR _STDIN _STDOUT string table tinsert tonumber tostring tremove type unpack _VERSION xpcall +# String, (table) & math functions +function_other=abs acos asin atan atan2 ceil cos deg exp floor format frexp gsub ldexp log log10 math.abs math.acos math.asin math.atan math.atan2 math.ceil math.cos math.cosh math.deg math.exp math.floor math.fmod math.frexp math.huge math.ldexp math.log math.log10 math.max math.min math.mod math.modf math.pi math.pow math.rad math.random math.randomseed math.sin math.sinh math.sqrt math.tan math.tanh max min mod rad random randomseed sin sqrt strbyte strchar strfind string.byte string.char string.dump string.find string.format string.gfind string.gmatch string.gsub string.len string.lower string.match string.rep string.reverse string.sub string.upper strlen strlower strrep strsub strupper table.concat table.foreach table.foreachi table.getn table.insert table.maxn table.remove table.setn table.sort tan +# (coroutines), I/O & system facilities +coroutines=appendto clock closefile coroutine.create coroutine.resume coroutine.running coroutine.status coroutine.wrap coroutine.yield date difftime execute exit flush getenv io.close io.flush io.input io.lines io.open io.output io.popen io.read io.stderr io.stdin io.stdout io.tmpfile io.type io.write openfile os.clock os.date os.difftime os.execute os.exit os.getenv os.remove os.rename os.setlocale os.time os.tmpname package.cpath package.loaded package.loadlib package.path package.preload package.seeall read readfrom remove rename seek setlocale time tmpfile tmpname write writeto +# user definable keywords +user1= +user2= +user3= +user4= + +[settings] +# 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 +# indention 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 + +[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= +run_cmd=lua "%f" + Modified: trunk/scintilla/KeyWords.cxx =================================================================== --- trunk/scintilla/KeyWords.cxx 2007-01-13 15:25:45 UTC (rev 1180) +++ trunk/scintilla/KeyWords.cxx 2007-01-13 20:16:09 UTC (rev 1181) @@ -167,6 +167,7 @@ LINK_LEXER(lmTCL); LINK_LEXER(lmVHDL); LINK_LEXER(lmD); + LINK_LEXER(lmLua); //--Autogenerated -- end of automatically generated section Added: trunk/scintilla/LexLua.cxx =================================================================== --- trunk/scintilla/LexLua.cxx (rev 0) +++ trunk/scintilla/LexLua.cxx 2007-01-13 20:16:09 UTC (rev 1181) @@ -0,0 +1,360 @@ +// Scintilla source code edit control +/** @file LexLua.cxx + ** Lexer for Lua language. + ** + ** Written by Paul Winwood. + ** Folder by Alexey Yutkin. + ** Modified by Marcos E. Wurzius & Philippe Lhoste + **/ + +#include <stdlib.h> +#include <string.h> +#include <ctype.h> +#include <stdarg.h> +#include <stdio.h> + +#include "Platform.h" + +#include "PropSet.h" +#include "Accessor.h" +#include "StyleContext.h" +#include "KeyWords.h" +#include "Scintilla.h" +#include "SciLexer.h" + +// Extended to accept accented characters +static inline bool IsAWordChar(int ch) { + return ch >= 0x80 || + (isalnum(ch) || ch == '.' || ch == '_'); +} + +static inline bool IsAWordStart(int ch) { + return ch >= 0x80 || + (isalpha(ch) || ch == '_'); +} + +static inline bool IsANumberChar(int ch) { + // Not exactly following number definition (several dots are seen as OK, etc.) + // but probably enough in most cases. + return (ch < 0x80) && + (isdigit(ch) || toupper(ch) == 'E' || + ch == '.' || ch == '-' || ch == '+' || + (ch >= 'a' && ch <= 'f') || (ch >= 'A' && ch <= 'F')); +} + +static inline bool IsLuaOperator(int ch) { + if (ch >= 0x80 || isalnum(ch)) { + return false; + } + // '.' left out as it is used to make up numbers + if (ch == '*' || ch == '/' || ch == '-' || ch == '+' || + ch == '(' || ch == ')' || ch == '=' || + ch == '{' || ch == '}' || ch == '~' || + ch == '[' || ch == ']' || ch == ';' || + ch == '<' || ch == '>' || ch == ',' || + ch == '.' || ch == '^' || ch == '%' || ch == ':' || + ch == '#') { + return true; + } + return false; +} + +// Test for [=[ ... ]=] delimiters, returns 0 if it's only a [ or ], +// return 1 for [[ or ]], returns >=2 for [=[ or ]=] and so on. +// The maximum number of '=' characters allowed is 254. +static int LongDelimCheck(StyleContext &sc) { + int sep = 1; + while (sc.GetRelative(sep) == '=' && sep < 0xFF) + sep++; + if (sc.GetRelative(sep) == sc.ch) + return sep; + return 0; +} + +static void ColouriseLuaDoc( + unsigned int startPos, + int length, + int initStyle, + WordList *keywordlists[], + Accessor &styler) { + + WordList &keywords = *keywordlists[0]; + WordList &keywords2 = *keywordlists[1]; + WordList &keywords3 = *keywordlists[2]; + WordList &keywords4 = *keywordlists[3]; + WordList &keywords5 = *keywordlists[4]; + WordList &keywords6 = *keywordlists[5]; + WordList &keywords7 = *keywordlists[6]; + WordList &keywords8 = *keywordlists[7]; + + int currentLine = styler.GetLine(startPos); + // Initialize long string [[ ... ]] or block comment --[[ ... ]] nesting level, + // if we are inside such a string. Block comment was introduced in Lua 5.0, + // blocks with separators [=[ ... ]=] in Lua 5.1. + int nestLevel = 0; + int sepCount = 0; + if (initStyle == SCE_LUA_LITERALSTRING || initStyle == SCE_LUA_COMMENT) { + int lineState = styler.GetLineState(currentLine - 1); + nestLevel = lineState >> 8; + sepCount = lineState & 0xFF; + } + + // Do not leak onto next line + if (initStyle == SCE_LUA_STRINGEOL || initStyle == SCE_LUA_COMMENTLINE || initStyle == SCE_LUA_PREPROCESSOR) { + initStyle = SCE_LUA_DEFAULT; + } + + StyleContext sc(startPos, length, initStyle, styler); + if (startPos == 0 && sc.ch == '#') { + // shbang line: # is a comment only if first char of the script + sc.SetState(SCE_LUA_COMMENTLINE); + } + for (; sc.More(); sc.Forward()) { + if (sc.atLineEnd) { + // Update the line state, so it can be seen by next line + currentLine = styler.GetLine(sc.currentPos); + switch (sc.state) { + case SCE_LUA_LITERALSTRING: + case SCE_LUA_COMMENT: + // Inside a literal string or block comment, we set the line state + styler.SetLineState(currentLine, (nestLevel << 8) | sepCount); + break; + default: + // Reset the line state + styler.SetLineState(currentLine, 0); + break; + } + } + if (sc.atLineStart && (sc.state == SCE_LUA_STRING)) { + // Prevent SCE_LUA_STRINGEOL from leaking back to previous line + sc.SetState(SCE_LUA_STRING); + } + + // Handle string line continuation + if ((sc.state == SCE_LUA_STRING || sc.state == SCE_LUA_CHARACTER) && + sc.ch == '\\') { + if (sc.chNext == '\n' || sc.chNext == '\r') { + sc.Forward(); + if (sc.ch == '\r' && sc.chNext == '\n') { + sc.Forward(); + } + continue; + } + } + + // Determine if the current state should terminate. + if (sc.state == SCE_LUA_OPERATOR) { + sc.SetState(SCE_LUA_DEFAULT); + } else if (sc.state == SCE_LUA_NUMBER) { + // We stop the number definition on non-numerical non-dot non-eE non-sign non-hexdigit char + if (!IsANumberChar(sc.ch)) { + sc.SetState(SCE_LUA_DEFAULT); + } else if (sc.ch == '-' || sc.ch == '+') { + if (sc.chPrev != 'E' && sc.chPrev != 'e') + sc.SetState(SCE_LUA_DEFAULT); + } + } else if (sc.state == SCE_LUA_IDENTIFIER) { + if (!IsAWordChar(sc.ch) || sc.Match('.', '.')) { + char s[100]; + sc.GetCurrent(s, sizeof(s)); + if (keywords.InList(s)) { + sc.ChangeState(SCE_LUA_WORD); + } else if (keywords2.InList(s)) { + sc.ChangeState(SCE_LUA_WORD2); + } else if (keywords3.InList(s)) { + sc.ChangeState(SCE_LUA_WORD3); + } else if (keywords4.InList(s)) { + sc.ChangeState(SCE_LUA_WORD4); + } else if (keywords5.InList(s)) { + sc.ChangeState(SCE_LUA_WORD5); + } else if (keywords6.InList(s)) { + sc.ChangeState(SCE_LUA_WORD6); + } else if (keywords6.InList(s)) { + sc.ChangeState(SCE_LUA_WORD6); + } else if (keywords7.InList(s)) { + sc.ChangeState(SCE_LUA_WORD7); + } else if (keywords8.InList(s)) { + sc.ChangeState(SCE_LUA_WORD8); + } + sc.SetState(SCE_LUA_DEFAULT); + } + } else if (sc.state == SCE_LUA_COMMENTLINE || sc.state == SCE_LUA_PREPROCESSOR) { + if (sc.atLineEnd) { + sc.ForwardSetState(SCE_LUA_DEFAULT); + } + } else if (sc.state == SCE_LUA_STRING) { + if (sc.ch == '\\') { + if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') { + sc.Forward(); + } + } else if (sc.ch == '\"') { + sc.ForwardSetState(SCE_LUA_DEFAULT); + } else if (sc.atLineEnd) { + sc.ChangeState(SCE_LUA_STRINGEOL); + sc.ForwardSetState(SCE_LUA_DEFAULT); + } + } else if (sc.state == SCE_LUA_CHARACTER) { + if (sc.ch == '\\') { + if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') { + sc.Forward(); + } + } else if (sc.ch == '\'') { + sc.ForwardSetState(SCE_LUA_DEFAULT); + } else if (sc.atLineEnd) { + sc.ChangeState(SCE_LUA_STRINGEOL); + sc.ForwardSetState(SCE_LUA_DEFAULT); + } + } else if (sc.state == SCE_LUA_LITERALSTRING || sc.state == SCE_LUA_COMMENT) { + if (sc.ch == '[') { + int sep = LongDelimCheck(sc); + if (sep == 1 && sepCount == 1) { // [[-only allowed to nest + nestLevel++; + sc.Forward(); + } + } else if (sc.ch == ']') { + int sep = LongDelimCheck(sc); + if (sep == 1 && sepCount == 1) { // un-nest with ]]-only + nestLevel--; + sc.Forward(); + if (nestLevel == 0) { + sc.ForwardSetState(SCE_LUA_DEFAULT); + } + } else if (sep > 1 && sep == sepCount) { // ]=]-style delim + sc.Forward(sep); + sc.ForwardSetState(SCE_LUA_DEFAULT); + } + } + } + + // Determine if a new state should be entered. + if (sc.state == SCE_LUA_DEFAULT) { + if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) { + sc.SetState(SCE_LUA_NUMBER); + if (sc.ch == '0' && toupper(sc.chNext) == 'X') { + sc.Forward(1); + } + } else if (IsAWordStart(sc.ch)) { + sc.SetState(SCE_LUA_IDENTIFIER); + } else if (sc.ch == '\"') { + sc.SetState(SCE_LUA_STRING); + } else if (sc.ch == '\'') { + sc.SetState(SCE_LUA_CHARACTER); + } else if (sc.ch == '[') { + sepCount = LongDelimCheck(sc); + if (sepCount == 0) { + sc.SetState(SCE_LUA_OPERATOR); + } else { + nestLevel = 1; + sc.SetState(SCE_LUA_LITERALSTRING); + sc.Forward(sepCount); + } + } else if (sc.Match('-', '-')) { + sc.SetState(SCE_LUA_COMMENTLINE); + if (sc.Match("--[")) { + sc.Forward(2); + sepCount = LongDelimCheck(sc); + if (sepCount > 0) { + nestLevel = 1; + sc.ChangeState(SCE_LUA_COMMENT); + sc.Forward(sepCount); + } + } else { + sc.Forward(); + } + } else if (sc.atLineStart && sc.Match('$')) { + sc.SetState(SCE_LUA_PREPROCESSOR); // Obsolete since Lua 4.0, but still in old code + } else if (IsLuaOperator(static_cast<char>(sc.ch))) { + sc.SetState(SCE_LUA_OPERATOR); + } + } + } + sc.Complete(); +} + +static void FoldLuaDoc(unsigned int startPos, int length, int /* initStyle */, WordList *[], + Accessor &styler) { + unsigned int lengthDoc = startPos + length; + int visibleChars = 0; + int lineCurrent = styler.GetLine(startPos); + int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK; + int levelCurrent = levelPrev; + char chNext = styler[startPos]; + bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0; + int styleNext = styler.StyleAt(startPos); + char s[10]; + + for (unsigned int i = startPos; i < lengthDoc; i++) { + char ch = chNext; + chNext = styler.SafeGetCharAt(i + 1); + int style = styleNext; + styleNext = styler.StyleAt(i + 1); + bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n'); + if (style == SCE_LUA_WORD) { + if (ch == 'i' || ch == 'd' || ch == 'f' || ch == 'e' || ch == 'r' || ch == 'u') { + for (unsigned int j = 0; j < 8; j++) { + if (!iswordchar(styler[i + j])) { + break; + } + s[j] = styler[i + j]; + s[j + 1] = '\0'; + } + + if ((strcmp(s, "if") == 0) || (strcmp(s, "do") == 0) || (strcmp(s, "function") == 0) || (strcmp(s, "repeat") == 0)) { + levelCurrent++; + } + if ((strcmp(s, "end") == 0) || (strcmp(s, "elseif") == 0) || (strcmp(s, "until") == 0)) { + levelCurrent--; + } + } + } else if (style == SCE_LUA_OPERATOR) { + if (ch == '{' || ch == '(') { + levelCurrent++; + } else if (ch == '}' || ch == ')') { + levelCurrent--; + } + } else if (style == SCE_LUA_LITERALSTRING || style == SCE_LUA_COMMENT) { + if (ch == '[') { + levelCurrent++; + } else if (ch == ']') { + levelCurrent--; + } + } + + if (atEOL) { + int lev = levelPrev; + if (visibleChars == 0 && foldCompact) { + lev |= SC_FOLDLEVELWHITEFLAG; + } + if ((levelCurrent > levelPrev) && (visibleChars > 0)) { + lev |= SC_FOLDLEVELHEADERFLAG; + } + if (lev != styler.LevelAt(lineCurrent)) { + styler.SetLevel(lineCurrent, lev); + } + lineCurrent++; + levelPrev = levelCurrent; + visibleChars = 0; + } + if (!isspacechar(ch)) { + visibleChars++; + } + } + // Fill in the real level of the next line, keeping the current flags as they will be filled in later + + int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK; + styler.SetLevel(lineCurrent, levelPrev | flagsNext); +} + +static const char * const luaWordListDesc[] = { + "Keywords", + "Basic functions", + "String, (table) & math functions", + "(coroutines), I/O & system facilities", + "user1", + "user2", + "user3", + "user4", + 0 +}; + +LexerModule lmLua(SCLEX_LUA, ColouriseLuaDoc, "lua", FoldLuaDoc, luaWordListDesc); Modified: trunk/scintilla/Makefile.am =================================================================== --- trunk/scintilla/Makefile.am 2007-01-13 15:25:45 UTC (rev 1180) +++ trunk/scintilla/Makefile.am 2007-01-13 20:16:09 UTC (rev 1181) @@ -19,6 +19,7 @@ LexD.cxx \ LexFortran.cxx \ LexHTML.cxx \ +LexLua.cxx \ LexOthers.cxx \ LexPascal.cxx \ LexPerl.cxx \ Modified: trunk/scintilla/makefile.win32 =================================================================== --- trunk/scintilla/makefile.win32 2007-01-13 15:25:45 UTC (rev 1180) +++ trunk/scintilla/makefile.win32 2007-01-13 20:16:09 UTC (rev 1181) @@ -62,7 +62,7 @@ LEXOBJS=\ LexBash.o LexAsm.o LexCSS.o LexConf.o LexCPP.o LexCrontab.o LexHTML.o LexOthers.o LexPascal.o \ LexPerl.o LexPython.o LexSQL.o LexCaml.o LexOMS.o LexTCL.o LexRuby.o LexFortran.o LexVHDL.o \ -LexD.o +LexD.o LeyLua.o #--Autogenerated -- end of automatically generated section all: $(COMPLIB) Modified: trunk/src/filetypes.c =================================================================== --- trunk/src/filetypes.c 2007-01-13 15:25:45 UTC (rev 1180) +++ trunk/src/filetypes.c 2007-01-13 20:16:09 UTC (rev 1181) @@ -1,7 +1,8 @@ /* * filetypes.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2005-2007 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -65,7 +66,9 @@ FILETYPE_UID_DIFF, // 23 FILETYPE_UID_FERITE, // 24 FILETYPE_UID_HTML, // 25 - FILETYPE_UID_VHDL // 26 + FILETYPE_UID_VHDL, // 26 + FILETYPE_UID_JS, // 27 + FILETYPE_UID_LUA // 28 }; @@ -108,6 +111,8 @@ case FILETYPE_UID_FERITE: return filetypes[GEANY_FILETYPES_FERITE]; case FILETYPE_UID_HTML: return filetypes[GEANY_FILETYPES_HTML]; case FILETYPE_UID_VHDL: return filetypes[GEANY_FILETYPES_VHDL]; + case FILETYPE_UID_JS: return filetypes[GEANY_FILETYPES_JS]; + case FILETYPE_UID_LUA: return filetypes[GEANY_FILETYPES_LUA]; default: return NULL; } } @@ -338,6 +343,26 @@ filetypes_init_build_programs(filetypes[GEANY_FILETYPES_PHP]); filetypes_create_menu_item(filetype_menu, filetypes[GEANY_FILETYPES_PHP]->title, filetypes[GEANY_FILETYPES_PHP]); +#define JAVASCRIPT + filetypes[GEANY_FILETYPES_JS] = g_new0(filetype, 1); + filetypes[GEANY_FILETYPES_JS]->id = GEANY_FILETYPES_JS; + filetypes[GEANY_FILETYPES_JS]->uid = FILETYPE_UID_JS; + filetypes[GEANY_FILETYPES_JS]->item = NULL; + filetypes[GEANY_FILETYPES_JS]->lang = 23; + filetypes[GEANY_FILETYPES_JS]->name = g_strdup("Javascript"); + filetypes[GEANY_FILETYPES_JS]->has_tags = TRUE; + filetypes[GEANY_FILETYPES_JS]->title = g_strdup(_("Javascript source file")); + filetypes[GEANY_FILETYPES_JS]->extension = g_strdup("js"); + filetypes[GEANY_FILETYPES_JS]->pattern = g_new0(gchar*, 3); + filetypes[GEANY_FILETYPES_JS]->pattern[0] = g_strdup("*.js"); + filetypes[GEANY_FILETYPES_JS]->pattern[1] = g_strdup("*.jsp"); /// TODO what is jsp actually? + filetypes[GEANY_FILETYPES_JS]->pattern[2] = NULL; + filetypes[GEANY_FILETYPES_JS]->style_func_ptr = styleset_js; + filetypes[GEANY_FILETYPES_JS]->comment_open = g_strdup("//"); + filetypes[GEANY_FILETYPES_JS]->comment_close = NULL; + filetypes_init_build_programs(filetypes[GEANY_FILETYPES_JS]); + filetypes_create_menu_item(filetype_menu, filetypes[GEANY_FILETYPES_JS]->title, filetypes[GEANY_FILETYPES_JS]); + #define PYTHON filetypes[GEANY_FILETYPES_PYTHON] = g_new0(filetype, 1); filetypes[GEANY_FILETYPES_PYTHON]->id = GEANY_FILETYPES_PYTHON; @@ -399,6 +424,25 @@ filetypes_init_build_programs(filetypes[GEANY_FILETYPES_TCL]); filetypes_create_menu_item(filetype_menu, filetypes[GEANY_FILETYPES_TCL]->title, filetypes[GEANY_FILETYPES_TCL]); +#define LUA + filetypes[GEANY_FILETYPES_LUA] = g_new0(filetype, 1); + filetypes[GEANY_FILETYPES_LUA]->id = GEANY_FILETYPES_LUA; + filetypes[GEANY_FILETYPES_LUA]->uid = FILETYPE_UID_LUA; + filetypes[GEANY_FILETYPES_LUA]->item = NULL; + filetypes[GEANY_FILETYPES_LUA]->lang = 22; + filetypes[GEANY_FILETYPES_LUA]->name = g_strdup("Lua"); + filetypes[GEANY_FILETYPES_LUA]->has_tags = TRUE; + filetypes[GEANY_FILETYPES_LUA]->title = g_strdup(_("Lua source file")); + filetypes[GEANY_FILETYPES_LUA]->extension = g_strdup("lua"); + filetypes[GEANY_FILETYPES_LUA]->pattern = g_new0(gchar*, 2); + filetypes[GEANY_FILETYPES_LUA]->pattern[0] = g_strdup("*.lua"); + filetypes[GEANY_FILETYPES_LUA]->pattern[1] = NULL; + filetypes[GEANY_FILETYPES_LUA]->style_func_ptr = styleset_lua; + filetypes[GEANY_FILETYPES_LUA]->comment_open = g_strdup("--"); + filetypes[GEANY_FILETYPES_LUA]->comment_close = NULL; + filetypes_init_build_programs(filetypes[GEANY_FILETYPES_LUA]); + filetypes_create_menu_item(filetype_menu, filetypes[GEANY_FILETYPES_LUA]->title, filetypes[GEANY_FILETYPES_LUA]); + #define FERITE filetypes[GEANY_FILETYPES_FERITE] = g_new0(filetype, 1); filetypes[GEANY_FILETYPES_FERITE]->id = GEANY_FILETYPES_FERITE; Modified: trunk/src/filetypes.h =================================================================== --- trunk/src/filetypes.h 2007-01-13 15:25:45 UTC (rev 1180) +++ trunk/src/filetypes.h 2007-01-13 20:16:09 UTC (rev 1181) @@ -1,7 +1,8 @@ /* * filetypes.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2005-2007 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -44,9 +45,11 @@ GEANY_FILETYPES_CAML, GEANY_FILETYPES_PERL, GEANY_FILETYPES_PHP, + GEANY_FILETYPES_JS, GEANY_FILETYPES_PYTHON, GEANY_FILETYPES_RUBY, GEANY_FILETYPES_TCL, + GEANY_FILETYPES_LUA, GEANY_FILETYPES_FERITE, GEANY_FILETYPES_SH, GEANY_FILETYPES_MAKE, Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2007-01-13 15:25:45 UTC (rev 1180) +++ trunk/src/highlighting.c 2007-01-13 20:16:09 UTC (rev 1181) @@ -1,7 +1,8 @@ /* * highlighting.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2005-2007 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -2755,3 +2756,168 @@ set_sci_style(sci, SCE_VHDL_USERWORD, GEANY_FILETYPES_VHDL, 14); } + +static void styleset_js_init(void) +{ + GKeyFile *config = g_key_file_new(); + GKeyFile *config_home = g_key_file_new(); + + load_keyfiles(config, config_home, GEANY_FILETYPES_JS); + + new_style_array(GEANY_FILETYPES_JS, 20); + styleset_c_like_init(config, config_home, GEANY_FILETYPES_JS); + + style_sets[GEANY_FILETYPES_JS].keywords = g_new(gchar*, 2); + get_keyfile_keywords(config, config_home, "keywords", "primary", GEANY_FILETYPES_JS, 0, "\ + abstract boolean break byte case catch char class \ + const continue debugger default delete do double else enum export extends \ + final finally float for function goto if implements import in instanceof \ + int interface long native new package private protected public \ + return short static super switch synchronized this throw throws \ + transient try typeof var void volatile while with"); + style_sets[GEANY_FILETYPES_JS].keywords[1] = NULL; + + get_keyfile_wordchars(config, config_home, &style_sets[GEANY_FILETYPES_JS].wordchars); + filetypes_get_config(config, config_home, GEANY_FILETYPES_JS); + + g_key_file_free(config); + g_key_file_free(config_home); +} + + +void styleset_js(ScintillaObject *sci) +{ + styleset_common(sci, 5); + if (style_sets[GEANY_FILETYPES_JS].styling == NULL) styleset_js_init(); + + SSM(sci, SCI_SETWORDCHARS, 0, (sptr_t) style_sets[GEANY_FILETYPES_JS].wordchars); + SSM(sci, SCI_AUTOCSETMAXHEIGHT, app->autocompletion_max_height, 0); + + SSM(sci, SCI_SETLEXER, SCLEX_CPP, 0); + + SSM(sci, SCI_SETCONTROLCHARSYMBOL, 32, 0); + + SSM(sci, SCI_SETKEYWORDS, 0, (sptr_t) style_sets[GEANY_FILETYPES_JS].keywords[0]); + + styleset_c_like(sci, GEANY_FILETYPES_JS); +} + + +static void styleset_lua_init(void) +{ + GKeyFile *config = g_key_file_new(); + GKeyFile *config_home = g_key_file_new(); + + load_keyfiles(config, config_home, GEANY_FILETYPES_LUA); + + new_style_array(GEANY_FILETYPES_LUA, 20); + + get_keyfile_hex(config, config_home, "styling", "default", "0x000000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_LUA].styling[0]); + get_keyfile_hex(config, config_home, "styling", "comment", "0xd00000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_LUA].styling[1]); + get_keyfile_hex(config, config_home, "styling", "commentline", "0xd00000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_LUA].styling[2]); + get_keyfile_hex(config, config_home, "styling", "commentdoc", "0x3f5fbf", "0xffffff", "true", &style_sets[GEANY_FILETYPES_LUA].styling[3]); + get_keyfile_hex(config, config_home, "styling", "number", "0x007f00", "0xffffff", "false", &style_sets[GEANY_FILETYPES_LUA].styling[4]); + get_keyfile_hex(config, config_home, "styling", "word", "0x00007f", "0xffffff", "true", &style_sets[GEANY_FILETYPES_LUA].styling[5]); + get_keyfile_hex(config, config_home, "styling", "string", "0xff901e", "0xffffff", "false", &style_sets[GEANY_FILETYPES_LUA].styling[6]); + get_keyfile_hex(config, config_home, "styling", "character", "0x008000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_LUA].styling[7]); + get_keyfile_hex(config, config_home, "styling", "literalstring", "0x008020", "0xffffff", "false", &style_sets[GEANY_FILETYPES_LUA].styling[8]); + get_keyfile_hex(config, config_home, "styling", "preprocessor", "0x007f7f", "0xffffff", "false", &style_sets[GEANY_FILETYPES_LUA].styling[9]); + get_keyfile_hex(config, config_home, "styling", "operator", "0x301010", "0xffffff", "false", &style_sets[GEANY_FILETYPES_LUA].styling[10]); + get_keyfile_hex(config, config_home, "styling", "identifier", "0x000000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_LUA].styling[11]); + get_keyfile_hex(config, config_home, "styling", "stringeol", "0x000000", "0xe0c0e0", "false", &style_sets[GEANY_FILETYPES_LUA].styling[12]); + get_keyfile_hex(config, config_home, "styling", "function_basic", "0x991111", "0xffffff", "false", &style_sets[GEANY_FILETYPES_LUA].styling[13]); + get_keyfile_hex(config, config_home, "styling", "function_other", "0x690000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_LUA].styling[14]); + get_keyfile_hex(config, config_home, "styling", "coroutines", "0x66005c", "0xffffff", "false", &style_sets[GEANY_FILETYPES_LUA].styling[15]); + get_keyfile_hex(config, config_home, "styling", "word5", "0x7979ff", "0xffffff", "false", &style_sets[GEANY_FILETYPES_LUA].styling[16]); + get_keyfile_hex(config, config_home, "styling", "word6", "0xad00ff", "0xffffff", "false", &style_sets[GEANY_FILETYPES_LUA].styling[17]); + get_keyfile_hex(config, config_home, "styling", "word7", "0x03D000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_LUA].styling[18]); + get_keyfile_hex(config, config_home, "styling", "word8", "0xff7600", "0xffffff", "false", &style_sets[GEANY_FILETYPES_LUA].styling[19]); + + style_sets[GEANY_FILETYPES_LUA].keywords = g_new(gchar*, 9); + get_keyfile_keywords(config, config_home, "keywords", "keywords", GEANY_FILETYPES_LUA, 0, + "and break do else elseif end false for function if \ + in local nil not or repeat return then true until while"); + get_keyfile_keywords(config, config_home, "keywords", "function_basic", GEANY_FILETYPES_LUA, 1, + "_VERSION assert collectgarbage dofile error gcinfo loadfile loadstring \ + print rawget rawset require tonumber tostring type unpack \ + _ALERT _ERRORMESSAGE _INPUT _PROMPT _OUTPUT \ + _STDERR _STDIN _STDOUT call dostring foreach foreachi getn globals newtype \ + sort tinsert tremove _G getfenv getmetatable ipairs loadlib next pairs pcall \ + rawequal setfenv setmetatable xpcall string table math coroutine io os debug \ + load module select"); + get_keyfile_keywords(config, config_home, "keywords", "function_other", GEANY_FILETYPES_LUA, 2, + "abs acos asin atan atan2 ceil cos deg exp \ + floor format frexp gsub ldexp log log10 max min mod rad random randomseed \ + sin sqrt strbyte strchar strfind strlen strlower strrep strsub strupper tan \ + string.byte string.char string.dump string.find string.len \ + string.lower string.rep string.sub string.upper string.format string.gfind string.gsub \ + table.concat table.foreach table.foreachi table.getn table.sort table.insert table.remove table.setn \ + math.abs math.acos math.asin math.atan math.atan2 math.ceil math.cos math.deg math.exp \ + math.floor math.frexp math.ldexp math.log math.log10 math.max math.min math.mod \ + math.pi math.pow math.rad math.random math.randomseed math.sin math.sqrt math.tan \ + string.gmatch string.match string.reverse table.maxn \ + math.cosh math.fmod math.modf math.sinh math.tanh math.huge"); + get_keyfile_keywords(config, config_home, "keywords", "coroutines", GEANY_FILETYPES_LUA, 3, + "openfile closefile readfrom writeto appendto remove rename flush seek tmpfile tmpname \ + read write clock date difftime execute exit getenv setlocale time coroutine.create \ + coroutine.resume coroutine.status coroutine.wrap coroutine.yield io.close io.flush \ + io.input io.lines io.open io.output io.read io.tmpfile io.type io.write io.stdin \ + io.stdout io.stderr os.clock os.date os.difftime os.execute os.exit os.getenv \ + os.remove os.rename os.setlocale os.time os.tmpname coroutine.running package.cpath \ + package.loaded package.loadlib package.path package.preload package.seeall io.popen"); + get_keyfile_keywords(config, config_home, "keywords", "user1", GEANY_FILETYPES_LUA, 4, ""); + get_keyfile_keywords(config, config_home, "keywords", "user2", GEANY_FILETYPES_LUA, 5, ""); + get_keyfile_keywords(config, config_home, "keywords", "user3", GEANY_FILETYPES_LUA, 6, ""); + get_keyfile_keywords(config, config_home, "keywords", "user4", GEANY_FILETYPES_LUA, 7, ""); + style_sets[GEANY_FILETYPES_LUA].keywords[8] = NULL; + + get_keyfile_wordchars(config, config_home, + &style_sets[GEANY_FILETYPES_LUA].wordchars); + filetypes_get_config(config, config_home, GEANY_FILETYPES_LUA); + + g_key_file_free(config); + g_key_file_free(config_home); +} + + +void styleset_lua(ScintillaObject *sci) +{ + styleset_common(sci, 5); + if (style_sets[GEANY_FILETYPES_LUA].styling == NULL) styleset_lua_init(); + + SSM(sci, SCI_SETWORDCHARS, 0, (sptr_t) style_sets[GEANY_FILETYPES_LUA].wordchars); + SSM(sci, SCI_AUTOCSETMAXHEIGHT, app->autocompletion_max_height, 0); + + SSM(sci, SCI_SETLEXER, SCLEX_LUA, 0); + + SSM(sci, SCI_SETKEYWORDS, 0, (sptr_t) style_sets[GEANY_FILETYPES_LUA].keywords[0]); + SSM(sci, SCI_SETKEYWORDS, 1, (sptr_t) style_sets[GEANY_FILETYPES_LUA].keywords[1]); + SSM(sci, SCI_SETKEYWORDS, 2, (sptr_t) style_sets[GEANY_FILETYPES_LUA].keywords[2]); + SSM(sci, SCI_SETKEYWORDS, 3, (sptr_t) style_sets[GEANY_FILETYPES_LUA].keywords[3]); + SSM(sci, SCI_SETKEYWORDS, 4, (sptr_t) style_sets[GEANY_FILETYPES_LUA].keywords[4]); + SSM(sci, SCI_SETKEYWORDS, 5, (sptr_t) style_sets[GEANY_FILETYPES_LUA].keywords[5]); + SSM(sci, SCI_SETKEYWORDS, 6, (sptr_t) style_sets[GEANY_FILETYPES_LUA].keywords[6]); + SSM(sci, SCI_SETKEYWORDS, 7, (sptr_t) style_sets[GEANY_FILETYPES_LUA].keywords[7]); + + set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_VHDL, 0); + set_sci_style(sci, SCE_LUA_DEFAULT, GEANY_FILETYPES_LUA, 0); + set_sci_style(sci, SCE_LUA_COMMENT, GEANY_FILETYPES_LUA, 1); + set_sci_style(sci, SCE_LUA_COMMENTLINE, GEANY_FILETYPES_LUA, 2); + set_sci_style(sci, SCE_LUA_COMMENTDOC, GEANY_FILETYPES_LUA, 3); + set_sci_style(sci, SCE_LUA_NUMBER, GEANY_FILETYPES_LUA, 4); + set_sci_style(sci, SCE_LUA_WORD, GEANY_FILETYPES_LUA, 5); + set_sci_style(sci, SCE_LUA_STRING, GEANY_FILETYPES_LUA, 6); + set_sci_style(sci, SCE_LUA_CHARACTER, GEANY_FILETYPES_LUA, 7); + set_sci_style(sci, SCE_LUA_LITERALSTRING, GEANY_FILETYPES_LUA, 8); + set_sci_style(sci, SCE_LUA_PREPROCESSOR, GEANY_FILETYPES_LUA, 9); + set_sci_style(sci, SCE_LUA_OPERATOR, GEANY_FILETYPES_LUA, 10); + set_sci_style(sci, SCE_LUA_IDENTIFIER, GEANY_FILETYPES_LUA, 11); + set_sci_style(sci, SCE_LUA_STRINGEOL, GEANY_FILETYPES_LUA, 12); + set_sci_style(sci, SCE_LUA_WORD2, GEANY_FILETYPES_LUA, 13); + set_sci_style(sci, SCE_LUA_WORD3, GEANY_FILETYPES_LUA, 14); + set_sci_style(sci, SCE_LUA_WORD4, GEANY_FILETYPES_LUA, 15); + set_sci_style(sci, SCE_LUA_WORD5, GEANY_FILETYPES_LUA, 16); + set_sci_style(sci, SCE_LUA_WORD6, GEANY_FILETYPES_LUA, 17); + set_sci_style(sci, SCE_LUA_WORD7, GEANY_FILETYPES_LUA, 18); + set_sci_style(sci, SCE_LUA_WORD8, GEANY_FILETYPES_LUA, 19); +} Modified: trunk/src/highlighting.h =================================================================== --- trunk/src/highlighting.h 2007-01-13 15:25:45 UTC (rev 1180) +++ trunk/src/highlighting.h 2007-01-13 20:16:09 UTC (rev 1181) @@ -1,7 +1,8 @@ /* * highlighting.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2005-2007 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -90,4 +91,8 @@ void styleset_vhdl(ScintillaObject *sci); +void styleset_js(ScintillaObject *sci); + +void styleset_lua(ScintillaObject *sci); + #endif Modified: trunk/src/sci_cb.c =================================================================== --- trunk/src/sci_cb.c 2007-01-13 15:25:45 UTC (rev 1180) +++ trunk/src/sci_cb.c 2007-01-13 20:16:09 UTC (rev 1181) @@ -1906,6 +1906,17 @@ result = TRUE; break; } + case SCLEX_LUA: + { + if (style == SCE_LUA_COMMENT || + style == SCE_LUA_COMMENTLINE || + style == SCE_LUA_COMMENTDOC || + style == SCE_LUA_LITERALSTRING || + style == SCE_LUA_CHARACTER || + style == SCE_LUA_STRING) + result = TRUE; + break; + } case SCLEX_HTML: { if (style == SCE_HPHP_SIMPLESTRING || Modified: trunk/src/templates.c =================================================================== --- trunk/src/templates.c 2007-01-13 15:25:45 UTC (rev 1180) +++ trunk/src/templates.c 2007-01-13 20:16:09 UTC (rev 1181) @@ -360,6 +360,12 @@ break; } + case GEANY_FILETYPES_JS: + { + line_prefix = "//"; + break; + } + case GEANY_FILETYPES_LATEX: { line_prefix = "%"; @@ -367,6 +373,7 @@ } case GEANY_FILETYPES_VHDL: + case GEANY_FILETYPES_LUA: { line_prefix = "--"; break; Modified: trunk/tagmanager/Makefile.am =================================================================== --- trunk/tagmanager/Makefile.am 2007-01-13 15:25:45 UTC (rev 1180) +++ trunk/tagmanager/Makefile.am 2007-01-13 20:16:09 UTC (rev 1181) @@ -32,6 +32,8 @@ diff.c\ docbook.c\ fortran.c\ + js.c\ + lua.c\ make.c\ asm.c\ latex.c\ Added: trunk/tagmanager/js.c =================================================================== --- trunk/tagmanager/js.c (rev 0) +++ trunk/tagmanager/js.c 2007-01-13 20:16:09 UTC (rev 1181) @@ -0,0 +1,1247 @@ +/* + * Copyright (c) 2003, 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 JavaScript language + * files. + * + * This is a good reference for different forms of the function statement: + * http://www.permadi.com/tutorial/jsFunc/ + */ + +/* + * INCLUDE FILES + */ +#include "general.h" /* must always come first */ +#include <ctype.h> /* to define isalpha () */ +#include <setjmp.h> +#ifdef DEBUG +#include <stdio.h> +#endif + +#include "main.h" +#include "entry.h" +#include "keyword.h" +#include "parse.h" +#include "read.h" +#include "vstring.h" + +/* + * MACROS + */ +#define isType(token,t) (boolean) ((token)->type == (t)) +#define isKeyword(token,k) (boolean) ((token)->keyword == (k)) + +/* + * DATA DECLARATIONS + */ + +typedef enum eException { ExceptionNone, ExceptionEOF } exception_t; + +/* + * Tracks class and function names already created + */ +static stringList *ClassNames; +static stringList *FunctionNames; + +/* Used to specify type of keyword. +*/ +typedef enum eKeywordId { + KEYWORD_NONE = -1, + KEYWORD_function, + KEYWORD_capital_function, + KEYWORD_prototype, + KEYWORD_var, + KEYWORD_new, + KEYWORD_this, + KEYWORD_for, + KEYWORD_while, + KEYWORD_do, + KEYWORD_if, + KEYWORD_else, + KEYWORD_switch +} keywordId; + +/* Used to determine whether keyword is valid for the token language and + * what its ID is. + */ +typedef struct sKeywordDesc { + const char *name; + keywordId id; +} keywordDesc; + +typedef enum eTokenType { + TOKEN_UNDEFINED, + TOKEN_CHARACTER, + TOKEN_CLOSE_PAREN, + TOKEN_SEMICOLON, + TOKEN_COLON, + TOKEN_COMMA, + TOKEN_KEYWORD, + TOKEN_OPEN_PAREN, + TOKEN_OPERATOR, + TOKEN_IDENTIFIER, + TOKEN_STRING, + TOKEN_PERIOD, + TOKEN_OPEN_CURLY, + TOKEN_CLOSE_CURLY, + TOKEN_EQUAL_SIGN, + TOKEN_FORWARD_SLASH +} tokenType; + +typedef struct sTokenInfo { + tokenType type; + keywordId keyword; + vString * string; + vString * scope; + unsigned long lineNumber; + fpos_t filePosition; + int nestLevel; +} tokenInfo; + +/* + * DATA DEFINITIONS + */ + +static langType Lang_js; + +static jmp_buf Exception; + +typedef enum { + JSTAG_FUNCTION, + JSTAG_CLASS, + JSTAG_METHOD, + JSTAG_VARIABLE, + JSTAG_COUNT +} jsKind; + +static kindOption JsKinds [] = { + { TRUE, 'f', "function", "functions" }, + { TRUE, 'c', "class", "classes" }, + { TRUE, 'm', "method", "methods" }, + { TRUE, 'v', "variable", "global variables" } +}; + +static const keywordDesc JsKeywordTable [] = { + /* keyword keyword ID */ + { "function", KEYWORD_function }, + { "Function", KEYWORD_capital_function }, + { "prototype", KEYWORD_prototype }, + { "var", KEYWORD_var }, + { "new", KEYWORD_new }, + { "this", KEYWORD_this }, + { "for", KEYWORD_for }, + { "while", KEYWORD_while }, + { "do", KEYWORD_do }, + { "if", KEYWORD_if }, + { "else", KEYWORD_else }, + { "switch", KEYWORD_switch } +}; + +/* + * FUNCTION DEFINITIONS + */ + +/* Recursive functions */ +static void parseFunction (tokenInfo *const token); +static boolean parseBlock (tokenInfo *const token, tokenInfo *const parent); +static boolean parseLine (tokenInfo *const token, boolean is_inside_class); + +static boolean isIdentChar1 (const int c) +{ + /* + * Other databases are less restrictive on the first character of + * an identifier. + * isIdentChar1 is used to identify the first character of an + * identifier, so we are removing some restrictions. + */ + return (boolean) + (isalpha (c) || c == '@' || c == '_' ); +} + +static boolean isIdentChar (const int c) +{ + return (boolean) + (isalpha (c) || isdigit (c) || c == '$' || + c == '@' || c == '_' || c == '#'); +} + +static void buildJsKeywordHash (void) +{ + const size_t count = sizeof (JsKeywordTable) / + sizeof (JsKeywordTable [0]); + size_t i; + for (i = 0 ; i < count ; ++i) + { + const keywordDesc* const p = &JsKeywordTable [i]; + addKeyword (p->name, Lang_js, (int) p->id); + } +} + +static tokenInfo *newToken (void) +{ + tokenInfo *const token = xMalloc (1, tokenInfo); + + token->type = TOKEN_UNDEFINED; + token->keyword = KEYWORD_NONE; + token->string = vStringNew (); + token->scope = vStringNew (); + token->nestLevel = 0; + + return token; +} + +static void deleteToken (tokenInfo *const token) +{ + vStringDelete (token->string); + vStringDelete (token->scope); + eFree (token); +} + +/* + * Tag generation functions + */ + +static void makeConstTag (tokenInfo *const token, const jsKind kind) +{ + if (JsKinds [kind].enabled) + { + const char *const name = vStringValue (token->string); + tagEntryInfo e; + initTagEntry (&e, name); + + e.lineNumber = token->lineNumber; + e.filePosition = token->filePosition; + e.kindName = JsKinds [kind].name; + e.kind = JsKinds [kind].letter; + + makeTagEntry (&e); + } +} + +static void makeJsTag (tokenInfo *const token, const jsKind kind) +{ + vString * fulltag; + + if (JsKinds [kind].enabled) + { + /* + * If a scope has been added to the token, change the token + * string to include the scope when making the tag. + */ + if ( vStringLength(token->scope) > 0 ) + { + fulltag = vStringNew (); + vStringCopy(fulltag, token->scope); + vStringCatS (fulltag, "."); + vStringCatS (fulltag, vStringValue(token->string)); + vStringTerminate(fulltag); + vStringCopy(token->string, fulltag); + vStringDelete (fulltag); + } + makeConstTag (token, kind); + } +} + +static void makeClassTag (tokenInfo *const token) +{ + if ( ! stringListHas(ClassNames, vStringValue (token->string)) ) + { + stringListAdd (ClassNames, vStringNewCopy (token->string)); + makeJsTag (token, JSTAG_CLASS); + } +} + +static void makeFunctionTag (tokenInfo *const token) +{ + if ( ! stringListHas(FunctionNames, vStringValue (token->string)) ) + { + stringListAdd (FunctionNames, vStringNewCopy (token->string)); + makeJsTag (token, JSTAG_FUNCTION); + } +} + +/* + * Parsing functions + */ + +static int skipToCharacter (const int c) +{ + int d; + do + { + d = fileGetc (); + } while (d != EOF && d != c); + return d; +} + +static void parseString (vString *const string, const int delimiter) +{ + boolean end = FALSE; + int c; + while (! end) + { + c = fileGetc (); + if (c == EOF) + end = TRUE; + else if (c == delimiter) + end = TRUE; + else + vStringPut (string, c); + } + vStringTerminate (string); +} + +/* Read a C identifier beginning with "firstChar" and places it into + * "name". + */ +static void parseIdentifier (vString *const string, const int firstChar) +{ + int c = firstChar; + Assert (isIdentChar1 (c)); + do + { + vStringPut (string, c); + c = fileGetc (); + } while (isIdentChar (c)); + vStringTerminate (string); + if (!isspace (c)) + fileUngetc (c); /* unget non-identifier character */ +} + +static keywordId analyzeToken (vString *const name) +{ + static vString *keyword = NULL; + if (keyword == NULL) + keyword = vStringNew (); + vStringCopyToLower (keyword, name); + return (keywordId) lookupKeyword (vStringValue (keyword), Lang_js); +} + +static void readToken (tokenInfo *const token) +{ + int c; + + token->type = TOKEN_UNDEFINED; + token->keyword = KEYWORD_NONE; + vStringClear (token->string); + +getNextChar: + do + { + c = fileGetc (); + /* + * Added " to the list of ignores, not sure what this + * might break but it gets by this issue: + * create table "t1" (...) + */ + } + while (c == '\t' || c == ' ' || c == '\n'); + + switch (c) + { + case EOF: longjmp (Exception, (int)ExceptionEOF); break; + case '(': token->type = TOKEN_OPEN_PAREN; break; + case ')': token->type = TOKEN_CLOSE_PAREN; break; + case ';': token->type = TOKEN_SEMICOLON; break; + case ',': token->type = TOKEN_COMMA; break; + case '.': token->type = TOKEN_PERIOD; break; + case ':': token->type = TOKEN_COLON; break; + case '{': token->type = TOKEN_OPEN_CURLY; break; + case '}': token->type = TOKEN_CLOSE_CURLY; break; + case '=': token->type = TOKEN_EQUAL_SIGN; break; + + case '\'': + case '"': + token->type = TOKEN_STRING; + parseString (token->string, c); + token->lineNumber = getSourceLineNumber (); + token->filePosition = getInputFilePosition (); + break; + + case '/': + { + int d = fileGetc (); + if ( (d != '*') && /* is this the start of a comment? */ + (d != '/') ) /* is a one line comment? */ + { + token->type = TOKEN_FORWARD_SLASH; + fileUngetc (d); + } + else + { + if (d == '*') + { + do + { + skipToCharacter ('*'); + c = fileGetc (); + if (c == '/') + break; + else + fileUngetc (c); + } while (c != EOF && c != '\0'); + goto getNextChar; + } + else if (d == '/') /* is this the start of a comment? */ + { + skipToCharacter ('\n'); + goto getNextChar; + } + } + break; + } + + default: + if (! isIdentChar1 (c)) + token->type = TOKEN_UNDEFINED; + else + { + parseIdentifier (token->string, c); + token->lineNumber = getSourceLineNumber (); + token->filePosition = getInputFilePosition (); + token->keyword = analyzeToken (token->string); + if (isKeyword (token, KEYWORD_NONE)) + token->type = TOKEN_IDENTIFIER; + else + token->type = TOKEN_KEYWORD; + } + break; + } +} + +static void copyToken (tokenInfo *const dest, tokenInfo *const src) +{ + dest->nestLevel = src->nestLevel; + dest->lineNumber = src->lineNumber; + dest->filePosition = src->filePosition; + dest->type = src->type; + dest->keyword = src->keyword; + vStringCopy(dest->string, src->string); + vStringCopy(dest->scope, src->scope); +} + +/* + * Token parsing functions + */ + +static void skipArgumentList (tokenInfo *const token) +{ + int nest_level = 0; + + /* + * Other databases can have arguments with fully declared + * datatypes: + * ( name varchar(30), text binary(10) ) + * So we must check for nested open and closing parantheses + */ + + if (isType (token, TOKEN_OPEN_PAREN)) /* arguments? */ + { + nest_level++; + while (! (isType (token, TOKEN_CLOSE_PAREN) && (nest_level == 0))) + { + readToken (token); + if (isType (token, TOKEN_OPEN_PAREN)) + { + nest_level++; + } + if (isType (token, TOKEN_CLOSE_PAREN)) + { + if (nest_level > 0) + { + nest_level--; + } + } + } + readToken (token); + } +} + +static void addContext (tokenInfo* const parent, const tokenInfo* const child) +{ + if (vStringLength (parent->string) > 0) + { + vStringCatS (parent->string, "."); + } + vStringCatS (parent->string, vStringValue(child->string)); + vStringTerminate(parent->string); +} + +static void addToScope (tokenInfo* const token, vString* const extra) +{ + if (vStringLength (token->scope) > 0) + { + vStringCatS (token->scope, "."); + } + vStringCatS (token->scope, vStringValue(extra)); + vStringTerminate(token->scope); +} + +/* + * Scanning functions + */ + +static void findCmdTerm (tokenInfo *const token) +{ + /* + * Read until we find either a semicolon or closing brace. + * Any nested braces will be handled within. + */ + while (! ( isType (token, TOKEN_SEMICOLON) || + isType (token, TOKEN_CLOSE_CURLY) ) ) + { + /* Handle nested blocks */ + if ( isType (token, TOKEN_OPEN_CURLY)) + { + parseBlock (token, token); + } + else + { + readToken (token); + } + } +} + +static void parseSwitch (tokenInfo *const token) +{ + /* + * switch (expression){ + * case value1: + * statement; + * break; + * case value2: + * statement; + * break; + * default : statement; + * } + */ + + readToken (token); + + if (isType (token, TOKEN_OPEN_PAREN)) + { + /* + * Handle nameless functions, these will only + * be considered methods. + */ + skipArgumentList(token); + } + + if (isType (token, TOKEN_OPEN_CURLY)) + { + /* + * This will be either a function or a class. + * We can only determine this by checking the body + * of the function. If we find a "this." we know + * it is a class, otherwise it is a function. + */ + parseBlock (token, token); + } + +} + +static void parseLoop (tokenInfo *const token) +{ + /* + * Handles these statements + * for (x=0; x<3; x++) + * document.write("This text is repeated three times "); + * + * for (x=0; x<3; x++) + * { + * document.write("This text is repeated three times "); + * } + * + * while (number<5){ + * document.write(number+" "); + * number++; + * } + * + * do{ + * document.write(number+" "); + * number++; + * } + * while (number<5); + */ + + if (isKeyword (token, KEYWORD_for) || isKeyword (token, KEYWORD_while)) + { + readToken(token); + + if (isType (token, TOKEN_OPEN_PAREN)) + { + /* + * Handle nameless functions, these will only + * be considered methods. + */ + skipArgumentList(token); + } + + if (isType (token, TOKEN_OPEN_CURLY)) + { + /* + * This will be either a function or a class. + * We can only determine this by checking the body + * of the function. If we find a "this." we know + * it is a class, otherwise it is a function. + */ + parseBlock (token, token); + } + else + { + parseLine(token, FALSE); + } + } + else if (isKeyword (token, KEYWORD_do)) + { + readToken(token); + + if (isType (token, TOKEN_OPEN_CURLY)) + { + /* + * This will be either a function or a class. + * We can only determine this by checking the body + * of the function. If we find a "this." we know + * it is a class, otherwise it is a function. + */ + parseBlock (token, token); + } + else + { + parseLine(token, FALSE); + } + + readToken(token); + + if (isKeyword (token, KEYWORD_while)) + { + readToken(token); + + if (isType (token, TOKEN_OPEN_PAREN)) + { + /* + * Handle nameless functions, these will only + * be considered methods. + */ + skipArgumentList(token); + } + } + } +} + +static void parseIf (tokenInfo *const token) +{ + /* + * If statements have two forms + * if ( ... ) + * one line; + * + * if ( ... ) { + * multiple; + * statements; + * } + * + * if ( ... ) { + * return elem + * } + * + * TODO: Deal with statements that can optional end + * without a semi-colon. Currently this messes up + * the parsing of blocks. + * Need to somehow detect this has happened, and either + * backup a token, or skip reading the next token if + * that is possible from all code locations. + * + */ + + readToken (token); + + if (isType (token, TOKEN_OPEN_PAREN)) + { + /* + * Handle nameless functions, these will only + * be considered methods. + */ + skipArgumentList(token); + } + + if (isType (token, TOKEN_OPEN_CURLY)) + { + /* + * This will be either a function or a class. + * We can only determine this by checking the body + * of the function. If we find a "this." we know + * it is a class, otherwise it is a function. + */ + parseBlock (token, token); + } + else + { + findCmdTerm (token); + } +} + +static void parseFunction (tokenInfo *const token) +{ + tokenInfo *const name = newToken (); + boolean is_class = FALSE; + + /* + * This deals with these formats + * function validFunctionTwo(a,b) {} + */ + + readToken (name); + /* Add scope in case this is an INNER function */ + addToScope(name, token->scope); + + readToken (token); + if (isType (token, TOKEN_PERIOD)) + { + do + { + readToken (token); + if ( isKeyword(token, KEYWORD_NONE) ) + { + addContext (name, token); + readToken (token); + } + } while (isType (token, TOKEN_PERIOD)); + } + + if ( isType (token, TOKEN_OPEN_PAREN) ) + skipArgumentList(token); + + if ( isType (token, TOKEN_OPEN_CURLY) ) + { + is_class = parseBlock (token, name); + if ( is_class ) + makeClassTag (name); + else + makeFunctionTag (name); + } + + findCmdTerm (token); + + deleteToken (name); +} + +static boolean parseBlock (tokenInfo *const token, tokenInfo *const parent) +{ + boolean is_class = FALSE; + boolean read_next_token = TRUE; + vString * saveScope = vStringNew (); + + token->nestLevel++; + /* + * Make this routine a bit more forgiving. + * If called on an open_curly advance it + */ + if ( isType (token, TOKEN_OPEN_CURLY) && + isKeyword(token, KEYWORD_NONE) ) + readToken(token); + + if (! isType (token, TOKEN_CLOSE_CURLY)) + { + /* + * Read until we find the closing brace, + * any nested braces will be handled within + */ + do + { + read_next_token = TRUE; + if (isKeyword (token, KEYWORD_this)) + { + /* + * Then we are inside a class and we have found + * a class, not a function + */ + is_class = TRUE; + vStringCopy(saveScope, token->scope); + addToScope (token, parent->string); + /* Move past this */ + readToken(token); + + /* Move past a potential . */ + if ( isType (token, TOKEN_PERIOD) ) + readToken(token); + + parseLine (token, is_class); + vStringCopy(token->scope, saveScope); + } + else if (isKeyword (token, KEYWORD_var)) + { + /* + * Potentially we have found an inner function. + * Set something to indicate the scope + */ + vStringCopy(saveScope, token->scope); + addToScope (token, parent->string); + parseLine (token, is_class); + vStringCopy(token->scope, saveScope); + } + else if (isKeyword (token, KEYWORD_function)) + { + vStringCopy(saveScope, token->scope); + addToScope (token, parent->string); + parseFunction (token); + vStringCopy(token->scope, saveScope); + } + else if (isType (token, TOKEN_OPEN_CURLY)) + { + /* Handle nested blocks */ + parseBlock (token, parent); + } + else + { + /* + * It is possible for a line to have no terminator + * if the following line is a closing brace. + * parseLine will detect this case and indicate + * whether we should read an additional token. + */ + read_next_token = parseLine (token, is_class); + } + + /* + * Always read a new token unless we find a statement without + * a ending terminator + */ + if( read_next_token ) + readToken(token); + + /* + * If we find a statement without a terminator consider the + * block finished, otherwise the stack will be off by one. + */ + } while (! isType (token, TOKEN_CLOSE_CURLY) && read_next_token ); + } + + vStringDelete(saveScope); + token->nestLevel--; + + return is_class; +} + +static void parseMethods (tokenInfo *const token, tokenInfo *const class) +{ + tokenInfo *const name = newToken (); + + /* + * This deals with these formats + * 'validMethod' : function(a,b) {} + */ + + do + { + readToken (token); + if (isType (token, TOKEN_STRING)) + { + copyToken(name, token); + + readToken (token); + if ( isType (token, TOKEN_COLON) ) + { + readToken (token); + if ( isKeyword (token, KEYWORD_function) ) + { + readToken (token); + if ( isType (token, TOKEN_OPEN_PAREN) ) + { + skipArgumentList(token); + } + + if (isType (token, TOKEN_OPEN_CURLY)) + { + addToScope (name, class->string); + makeJsTag (name, JSTAG_METHOD); + parseBlock (token, name); + + /* + * Read to the closing curly, check next + * token, if comma, we must loop again + */ + readToken (token); + } + } + } + } + } while ( isType(token, TOKEN_COMMA) ); + + findCmdTerm (token); + + deleteToken (name); +} + +static boolean parseStatement (tokenInfo *const token, boolean is_inside_class) +{ + tokenInfo *const name = newToken (); + tokenInfo *const secondary_name = newToken (); + vString * saveScope = vStringNew (); + boolean is_class = FALSE; + boolean is_terminated = TRUE; + boolean is_global = FALSE; + + vStringClear(saveScope); + /* + * Functions can be named or unnamed. + * This deals with these formats: + * Function + * validFunctionOne = function(a,b) {} + * testlib.validFunctionFive = function(a,b) {} + * var innerThree = function(a,b) {} + * var innerFour = (a,b) {} + * var D2 = secondary_fcn_name(a,b) {} + * var D3 = new Function("a", "b", "return a+b;"); + * Class + * testlib.extras.ValidClassOne = function(a,b) { + * this.a = a; + * } + * Class Methods + * testlib.extras.ValidClassOne.prototype = { + * 'validMethodOne' : function(a,b) {}, + * 'validMethodTwo' : function(a,b) {} + * } + * Database.prototype.getTodaysDate = Database_getTodaysDate; + */ + + if ( is_inside_class ) + is_class = TRUE; + /* + * var can preceed an inner function + */ + if ( isKeyword(token, KEYWORD_var) ) + { + /* + * Only create variables for global scope + */ + if ( token->nestLevel == 0 ) + { + is_global = TRUE; + } + readToken(token); + } + + copyToken(name, token); + + /* Potentially the name of the function */ + readToken (token); + if (isType (token, TOKEN_PERIOD)) + { + /* + * Cannot be a global variable is it has dot references in the name + */ + is_global = FALSE; + do + { + readToken (token); + if ( isKeyword(token, KEYWORD_NONE) ) + { + if ( is_class ) + { + vStringCopy(saveScope, token->scope); + addToScope(token, name->string); + makeJsTag (token, JSTAG_METHOD); + + /* Find to the end of the statement */ + findCmdTerm (token); + goto cleanUp; + } + else + addContext (name, token); + } + else if ( isKeyword(token, KEYWORD_prototype) ) + { + makeClassTag (name); + is_class = TRUE; + } + readToken (token); + } while (isType (token, TOKEN_PERIOD)); + } + + if ( isType (token, TOKEN_EQUAL_SIGN) ) + { + readToken (token); + + if ( isKeyword (token, KEYWORD_function) ) + { + readToken (token); + + if ( isKeyword (token, KEYWORD_NONE) && + ! isType (token, TOKEN_OPEN_PAREN) ) + { + /* + * Functions of this format: + * var D2A=function theAdd(a, b) + * { + * return a+b; + * } + * Are really two separately defined functions and + * can be referenced in two ways: + * alert(D2A(1,2)); // produces 3 + * alert(theAdd(1,2)); // also produces 3 + * So it must have two tags: + * D2A + * theAdd + * Save the reference to the name for later use, once + * we have established this is a valid function we will + * create the secondary reference to it. + */ + copyToken(secondary_name, token); + readToken (token); + } + + if ( isType (token, TOKEN_OPEN_PAREN) ) + skipArgumentList(token); + + if (isType (token, TOKEN_OPEN_CURLY)) + { + /* + * This will be either a function or a class. + * We can only determine this by checking the body + * of the function. If we find a "this." we know + * it is a class, otherwise it is a function. + */ + if ( is_inside_class ) + { + makeJsTag (name, JSTAG_METHOD); + if ( vStringLength(secondary_name->string) > 0 ) + makeFunctionTag (secondary_name); + parseBlock (token, name); + } + else + { + is_class = parseBlock (token, name); + if ( is_class ) + makeClassTag (name); + else + makeFunctionTag (name); + + if ( vStringLength(secondary_name->string) > 0 ) + makeFunctionTag (secondary_name); + } + } + } + else if (isType (token, TOKEN_OPEN_PAREN)) + { + /* + * Handle nameless functions, these will only + * be considered methods. + */ + skipArgumentList(token); + + if (isType (token, TOKEN_OPEN_CURLY)) + { + /* + * This will be either a function or a class. + * We can only determine this by checking the body + * of the function. If we find a "this." we know + * it is a class, otherwise it is a function. + */ + makeJsTag (name, JSTAG_METHOD); + parseBlock (token, name); + } + } + else if (isType (token, TOKEN_OPEN_CURLY)) + { + parseMethods(token, name); + } + else if (isKeyword (token, KEYWORD_new)) + { + readToken (token); + if ( isKeyword (token, KEYWORD_function) || + isKeyword (token, KEYWORD_capital_function) ) + { + readToken (token); + if ( isType (token, TOKEN_OPEN_PAREN) ) + skipArgumentList(token); + + if (isType (token, TOKEN_SEMICOLON)) + makeFunctionTag (name); + } + } + else if (isKeyword (token, KEYWORD_NONE)) + { + /* + * Only create variables for global scope + */ + if ( token->nestLevel == 0 && is_global ) + { + /* + * A pointer can be created to the function. + * If we recognize the function/class name ignore the variable. + * This format looks identical to a variable definition. + * A variable defined outside of a block is considered + * a global variable: + * var g_var1 = 1; + * var g_var2; + * This is not a global variable: + * var g_var = function; + * This is a global variable: + * var g_var = different_var_name; + */ + if ( ! stringListHas(FunctionNames, vStringValue (token->string)) && + ! stringListHas(ClassNames, vStringValue (token->string)) ) + { + readToken (token); + if (isType (token, TOKEN_SEMICOLON)) + makeJsTag (name, JSTAG_VARIABLE); + } + } + } + } + else + { + /* + * Only create variables for global scope + */ + if ( token->nestLevel == 0 && is_global ) + { + /* + * Handles this syntax: + * var g_var2; + */ + if (isType (token, TOKEN_SEMICOLON)) + makeJsTag (name, JSTAG_VARIABLE); + } + } + findCmdTerm (token); + + /* + * Statements can be optionally terminated in the case of + * statement prior to a close curly brace as in the + * document.write line below: + * + * function checkForUpdate() { + * if( 1==1 ) { + * document.write("hello from checkForUpdate ") + * } + * return 1; + * } + */ + if (isType (token, TOKEN_CLOSE_CURLY)) + is_terminated = FALSE; + + +cleanUp: + vStringCopy(token->scope, saveScope); + deleteToken (name); + deleteToken (secondary_name); + vStringDelete(saveScope); + + return is_terminated; +} + +static boolean parseLine (tokenInfo *const token, boolean is_inside_class) +{ + boolean is_terminated = TRUE; + /* + * Detect the common statements, if, while, for, do, ... + * This is necessary since the last statement within a block "{}" + * can be optionally terminated. + * + * If the statement is not terminated, we need to tell + * the calling routine to prevent reading an additional token + * looking for the end of the statement. + */ + + if (isType(token, TOKEN_KEYWORD)) + { + switch (token->keyword) + { + case KEYWORD_for: + case KEYWORD_while: + case KEYWORD_do: + parseLoop (token); + break; + case KEYWORD_if: + case KEYWORD_else: + parseIf (token); + break; + case KEYWORD_switch: + parseSwitch (token); + break; + default: + parseStatement (token, is_inside_class); + break; + } + } + else + { + /* + * Special case where single line statements may not be + * SEMICOLON termianted. parseBlock needs to know this + * so that it does not read the next token. + */ + is_terminated = parseStatement (token, is_inside_class); + } + return is_terminated; +} + +static void parseJsFile (tokenInfo *const token) +{ + do + { + readToken (token); + + if (isType(token, TOKEN_KEYWORD)) + { + switch (token->keyword) + { + case KEYWORD_function: parseFunction (token); break; + default: parseLine (token, FALSE); break; + } + } + else + { + parseLine (token, FALSE); + } + } while (TRUE); +} + +static void initialize (const langType language) +{ + Assert (sizeof (JsKinds) / sizeof (JsKinds [0]) == JSTAG_COUNT); + Lang_js = language; + buildJsKeywordHash (); +} + +static void findJsTags (void) +{ + tokenInfo *const token = newToken (); + exception_t exception = (exception_t) (setjmp (Exception)); + ClassNames = stringListNew (); + FunctionNames = stringListNew (); + + while (exception == ExceptionNone) + parseJsFile (token); + + stringListDelete (ClassNames); + stringListDelete (FunctionNames); + ClassNames = NULL; + FunctionNames = NULL; + deleteToken (token); +} + +/* Create parser definition stucture */ +extern parserDefinition* JavaScriptParser (void) +{ + static const char *const extensions [] = { "js", NULL }; + + parserDefinition *const def = parserNew ("Javascript"); + def->extensions = extensions; + /* + * New definitions for parsing instead of regex + */ + def->kinds = JsKinds; + def->kindCount = KIND_COUNT (JsKinds); + def->parser = findJsTags; + def->initialize = initialize; + + return def; +} + +/* vi:set tabstop=4 shiftwidth=4 noexpandtab: */ Added: trunk/tagmanager/lua.c =================================================================== --- trunk/tagmanager/lua.c (rev 0) +++ trunk/tagmanager/lua.c 2007-01-13 20:16:09 UTC (rev 1181) @@ -0,0 +1,132 @@ +/* +* $Id$ +* +* Copyright (c) 2000-2001, Max Ischenko <mfi(a)ukr.net>. +* +* 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 Lua language. +*/ + +/* +* INCLUDE FILES +*/ +#include "general.h" /* must always come first */ + +#include <string.h> + +#include "parse.h" +#include "read.h" +#include "vstring.h" + +/* +* DATA DEFINITIONS +*/ +typedef enum { + K_FUNCTION +} luaKind; + +static kindOption LuaKinds [] = { + { TRUE, 'f', "function", "functions" } +}; + +/* +* FUNCTION DEFINITIONS +*/ + +/* for debugging purposes */ +static void __unused__ print_string (char *p, char *q) +{ + for ( ; p != q; p++) + fprintf (errout, "%c", *p); + fprintf (errout, "\n"); +} + +/* + * Helper function. + * Returns 1 if line looks like a line of Lua code. + * + * TODO: Recognize UNIX bang notation. + * (Lua treat first line as a comment if it starts with #!) + * + */ +static boolean is_a_code_line (const unsigned char *line) +{ + boolean result; + const unsigned char *p = line; + while (isspace ((int) *p)) + p++; + if (p [0] == '\0') + result = FALSE; + else if (p [0] == '-' && p [1] == '-') + result = FALSE; + else + result = TRUE; + return result; +} + +static void extract_name (const char *begin, const char *end, vString *name) +{ + if (begin != NULL && end != NULL && begin < end) + { + const char *cp; + + while (isspace ((int) *begin)) + begin++; + while (isspace ((int) *end)) + end--; + if (begin < end) + { + for (cp = begin ; cp != end; cp++) + vStringPut (name, (int) *cp); + vStringTerminate (name); + + makeSimpleTag (name, LuaKinds, K_FUNCTION); + vStringClear (name); + } + } +} + +static void findLuaTags (void) +{ + vString *name = vStringNew (); + const unsigned char *line; + + while ((line = fileReadLine ()) != NULL) + { + const char *p, *q; + + if (! is_a_code_line (line)) + continue; + + p = (const char*) strstr ((const char*) line, "function"); + if (p == NULL) + continue; + + q = strchr ((const char*) line, '='); + + if (q == NULL) { + p = p + 9; /* skip the `function' word */ + q = strchr ((const char*) p, '('); + extract_name (p, q, name); + } else { + p = (const char*) &line[0]; + extract_name (p, q, name); + } + } + vStringDelete (name); +} + +extern parserDefinition* LuaParser (void) +{ + static const char* const extensions [] = { "lua", NULL }; + parserDefinition* def = parserNew ("Lua"); + def->kinds = LuaKinds; + def->kindCount = KIND_COUNT (LuaKinds); + def->extensions = extensions; + def->parser = findLuaTags; + return def; +} + +/* vi:set tabstop=4 shiftwidth=4: */ Modified: trunk/tagmanager/makefile.win32 =================================================================== --- trunk/tagmanager/makefile.win32 2007-01-13 15:25:45 UTC (rev 1180) +++ trunk/tagmanager/makefile.win32 2007-01-13 20:16:09 UTC (rev 1181) @@ -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 diff.o vhdl.o \ +$(COMPLIB): args.o c.o fortran.o make.o conf.o pascal.o perl.o php.o diff.o vhdl.o lua.o js.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 2007-01-13 15:25:45 UTC (rev 1180) +++ trunk/tagmanager/parsers.h 2007-01-13 20:16:09 UTC (rev 1181) @@ -36,7 +36,9 @@ FortranParser, \ FeriteParser, \ DiffParser, \ - VhdlParser + VhdlParser, \ + LuaParser, \ + JavaScriptParser /* langType of each parser @@ -62,6 +64,8 @@ 19 FeriteParser 20 DiffParser 21 VhdlParser +22 LuaParser +23 JavaScriptParser */ #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: [1180] trunk
by ntrel＠users.sourceforge.net 13 Jan '07

13 Jan '07

Revision: 1180 http://svn.sourceforge.net/geany/?rev=1180&view=rev Author: ntrel Date: 2007-01-13 07:25:45 -0800 (Sat, 13 Jan 2007) Log Message: ----------- Update the symbol list when starting a new document. Modified Paths: -------------- trunk/ChangeLog trunk/src/document.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-01-13 13:25:05 UTC (rev 1179) +++ trunk/ChangeLog 2007-01-13 15:25:45 UTC (rev 1180) @@ -7,6 +7,8 @@ src/ui_utils.c, src/symbols.h: Move utils_compare_symbol(), GeanySymbol, recreate_tag_list() to symbols.c. + * src/document.c: + Update the symbol list when starting a new document. 2007-01-12 Nick Treleaven <nick.treleaven(a)btinternet.com> Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2007-01-13 13:25:05 UTC (rev 1179) +++ trunk/src/document.c 2007-01-13 15:25:45 UTC (rev 1180) @@ -414,8 +414,11 @@ if (ft == NULL) filetypes[GEANY_FILETYPES_ALL]->style_func_ptr(doc_list[idx].sci); ui_set_window_title(idx); build_menu_update(idx); + doc_list[idx].mtime = time(NULL); doc_list[idx].changed = FALSE; + + document_update_tag_list(idx, FALSE); document_set_text_changed(idx); ui_document_show_hide(idx); //update the document menu This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1179] trunk
by ntrel＠users.sourceforge.net 13 Jan '07

13 Jan '07

Revision: 1179 http://svn.sourceforge.net/geany/?rev=1179&view=rev Author: ntrel Date: 2007-01-13 05:25:05 -0800 (Sat, 13 Jan 2007) Log Message: ----------- Move utils_compare_symbol(), GeanySymbol, recreate_tag_list() to symbols.c. Modified Paths: -------------- trunk/ChangeLog trunk/src/geany.h trunk/src/symbols.c trunk/src/symbols.h trunk/src/ui_utils.c trunk/src/utils.c trunk/src/utils.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-01-13 12:42:12 UTC (rev 1178) +++ trunk/ChangeLog 2007-01-13 13:25:05 UTC (rev 1179) @@ -3,6 +3,10 @@ * src/main.c, src/socket.c, po/POTFILES.in: Print an error message (instead of debug message) when a command-line file cannot be loaded. + * src/utils.c, src/utils.h, src/geany.h, src/symbols.c, + src/ui_utils.c, src/symbols.h: + Move utils_compare_symbol(), GeanySymbol, recreate_tag_list() + to symbols.c. 2007-01-12 Nick Treleaven <nick.treleaven(a)btinternet.com> Modified: trunk/src/geany.h =================================================================== --- trunk/src/geany.h 2007-01-13 12:42:12 UTC (rev 1178) +++ trunk/src/geany.h 2007-01-13 13:25:05 UTC (rev 1179) @@ -187,15 +187,6 @@ MyApp *app; -// small struct to track tag name and type together -typedef struct GeanySymbol -{ - gchar *str; - gint type; - gint line; -} GeanySymbol; - - enum { GEANY_IMAGE_SMALL_CROSS, Modified: trunk/src/symbols.c =================================================================== --- trunk/src/symbols.c 2007-01-13 12:42:12 UTC (rev 1178) +++ trunk/src/symbols.c 2007-01-13 13:25:05 UTC (rev 1179) @@ -24,12 +24,14 @@ #include "geany.h" #include <ctype.h> +#include <string.h> #include "symbols.h" #include "utils.h" #include "filetypes.h" #include "encodings.h" #include "document.h" +#include "treeviews.h" const guint TM_GLOBAL_TYPE_MASK = @@ -176,75 +178,6 @@ } -const GList *symbols_get_tag_list(gint idx, guint tag_types) -{ - static GList *tag_names = NULL; - - if (idx >= 0 && doc_list[idx].is_valid && doc_list[idx].tm_file && - doc_list[idx].tm_file->tags_array) - { - TMTag *tag; - guint i; - GeanySymbol *symbol; - gboolean doc_is_utf8 = FALSE; - gchar *utf8_name; - const gchar *cosep = - symbols_get_context_separator(FILETYPE_ID(doc_list[idx].file_type)); - - if (tag_names) - { - GList *tmp; - for (tmp = tag_names; tmp; tmp = g_list_next(tmp)) - { - g_free(((GeanySymbol*)tmp->data)->str); - g_free(tmp->data); - } - g_list_free(tag_names); - tag_names = NULL; - } - - // do this comparison only once - if (utils_str_equal(doc_list[idx].encoding, "UTF-8")) doc_is_utf8 = TRUE; - - for (i = 0; i < (doc_list[idx].tm_file)->tags_array->len; ++i) - { - tag = TM_TAG((doc_list[idx].tm_file)->tags_array->pdata[i]); - if (tag == NULL) - return NULL; - - if (tag->type & tag_types) - { - if (! doc_is_utf8) utf8_name = encodings_convert_to_utf8_from_charset(tag->name, - -1, doc_list[idx].encoding, TRUE); - else utf8_name = tag->name; - if ((tag->atts.entry.scope != NULL) && isalpha(tag->atts.entry.scope[0])) - { - symbol = g_new0(GeanySymbol, 1); - symbol->str = g_strdup_printf("%s%s%s [%ld]", tag->atts.entry.scope, cosep, - utf8_name, tag->atts.entry.line); - symbol->type = tag->type; - symbol->line = tag->atts.entry.line; - tag_names = g_list_prepend(tag_names, symbol); - } - else - { - symbol = g_new0(GeanySymbol, 1); - symbol->str = g_strdup_printf("%s [%ld]", utf8_name, tag->atts.entry.line); - symbol->type = tag->type; - symbol->line = tag->atts.entry.line; - tag_names = g_list_prepend(tag_names, symbol); - } - if (! doc_is_utf8) g_free(utf8_name); - } - } - tag_names = g_list_sort(tag_names, (GCompareFunc) utils_compare_symbol); - return tag_names; - } - else - return NULL; -} - - GString *symbols_get_macro_list() { guint j, i; @@ -330,3 +263,187 @@ { g_strfreev(html_entities); } + + +// small struct to track tag name and type together +typedef struct GeanySymbol +{ + gchar *str; + gint type; + gint line; +} GeanySymbol; + + +/* wrapper function to let strcmp work with GeanySymbol struct */ +static gint compare_symbol(const GeanySymbol *a, const GeanySymbol *b) +{ + if (a == NULL || b == NULL) return 0; + + return strcmp(a->str, b->str); +} + + +static const GList * +get_tag_list(gint idx, guint tag_types) +{ + static GList *tag_names = NULL; + + if (idx >= 0 && doc_list[idx].is_valid && doc_list[idx].tm_file && + doc_list[idx].tm_file->tags_array) + { + TMTag *tag; + guint i; + GeanySymbol *symbol; + gboolean doc_is_utf8 = FALSE; + gchar *utf8_name; + const gchar *cosep = + symbols_get_context_separator(FILETYPE_ID(doc_list[idx].file_type)); + + if (tag_names) + { + GList *tmp; + for (tmp = tag_names; tmp; tmp = g_list_next(tmp)) + { + g_free(((GeanySymbol*)tmp->data)->str); + g_free(tmp->data); + } + g_list_free(tag_names); + tag_names = NULL; + } + + // do this comparison only once + if (utils_str_equal(doc_list[idx].encoding, "UTF-8")) doc_is_utf8 = TRUE; + + for (i = 0; i < (doc_list[idx].tm_file)->tags_array->len; ++i) + { + tag = TM_TAG((doc_list[idx].tm_file)->tags_array->pdata[i]); + if (tag == NULL) + return NULL; + + if (tag->type & tag_types) + { + if (! doc_is_utf8) utf8_name = encodings_convert_to_utf8_from_charset(tag->name, + -1, doc_list[idx].encoding, TRUE); + else utf8_name = tag->name; + if ((tag->atts.entry.scope != NULL) && isalpha(tag->atts.entry.scope[0])) + { + symbol = g_new0(GeanySymbol, 1); + symbol->str = g_strdup_printf("%s%s%s [%ld]", tag->atts.entry.scope, cosep, + utf8_name, tag->atts.entry.line); + symbol->type = tag->type; + symbol->line = tag->atts.entry.line; + tag_names = g_list_prepend(tag_names, symbol); + } + else + { + symbol = g_new0(GeanySymbol, 1); + symbol->str = g_strdup_printf("%s [%ld]", utf8_name, tag->atts.entry.line); + symbol->type = tag->type; + symbol->line = tag->atts.entry.line; + tag_names = g_list_prepend(tag_names, symbol); + } + if (! doc_is_utf8) g_free(utf8_name); + } + } + tag_names = g_list_sort(tag_names, (GCompareFunc) compare_symbol); + return tag_names; + } + else + return NULL; +} + + +gboolean symbols_recreate_tag_list(gint idx) +{ + GList *tmp; + const GList *tags; + GtkTreeIter iter; + GtkTreeModel *model; + + tags = get_tag_list(idx, tm_tag_max_t); + if (doc_list[idx].tm_file == NULL || tags == NULL) return FALSE; + + gtk_tree_store_clear(doc_list[idx].tag_store); + // unref the store to speed up the filling(from TreeView Tutorial) + model = gtk_tree_view_get_model(GTK_TREE_VIEW(doc_list[idx].tag_tree)); + g_object_ref(model); // Make sure the model stays with us after the tree view unrefs it + gtk_tree_view_set_model(GTK_TREE_VIEW(doc_list[idx].tag_tree), NULL); // Detach model from view + + treeviews_init_tag_list(idx); + for (tmp = (GList*)tags; tmp; tmp = g_list_next(tmp)) + { + switch (((GeanySymbol*)tmp->data)->type) + { + case tm_tag_prototype_t: + case tm_tag_method_t: + case tm_tag_function_t: + { + if (tv.tag_function.stamp == -1) break; + gtk_tree_store_append(doc_list[idx].tag_store, &iter, &(tv.tag_function)); + gtk_tree_store_set(doc_list[idx].tag_store, &iter, 0, ((GeanySymbol*)tmp->data)->str, -1); + break; + } + case tm_tag_macro_t: + case tm_tag_macro_with_arg_t: + { + if (tv.tag_macro.stamp == -1) break; + gtk_tree_store_append(doc_list[idx].tag_store, &iter, &(tv.tag_macro)); + gtk_tree_store_set(doc_list[idx].tag_store, &iter, 0, ((GeanySymbol*)tmp->data)->str, -1); + break; + } + case tm_tag_class_t: + { + if (tv.tag_class.stamp == -1) break; + gtk_tree_store_append(doc_list[idx].tag_store, &iter, &(tv.tag_class)); + gtk_tree_store_set(doc_list[idx].tag_store, &iter, 0, ((GeanySymbol*)tmp->data)->str, -1); + break; + } + case tm_tag_member_t: + case tm_tag_field_t: + { + if (tv.tag_member.stamp == -1) break; + gtk_tree_store_append(doc_list[idx].tag_store, &iter, &(tv.tag_member)); + gtk_tree_store_set(doc_list[idx].tag_store, &iter, 0, ((GeanySymbol*)tmp->data)->str, -1); + break; + } + case tm_tag_typedef_t: + case tm_tag_enum_t: + case tm_tag_union_t: + case tm_tag_struct_t: + case tm_tag_interface_t: + { + if (tv.tag_struct.stamp == -1) break; + gtk_tree_store_append(doc_list[idx].tag_store, &iter, &(tv.tag_struct)); + gtk_tree_store_set(doc_list[idx].tag_store, &iter, 0, ((GeanySymbol*)tmp->data)->str, -1); + break; + } + case tm_tag_variable_t: + { + if (tv.tag_variable.stamp == -1) break; + gtk_tree_store_append(doc_list[idx].tag_store, &iter, &(tv.tag_variable)); + gtk_tree_store_set(doc_list[idx].tag_store, &iter, 0, ((GeanySymbol*)tmp->data)->str, -1); + break; + } + case tm_tag_namespace_t: + case tm_tag_package_t: + { + if (tv.tag_namespace.stamp == -1) break; + gtk_tree_store_append(doc_list[idx].tag_store, &iter, &(tv.tag_namespace)); + gtk_tree_store_set(doc_list[idx].tag_store, &iter, 0, ((GeanySymbol*)tmp->data)->str, -1); + break; + } + default: + { + if (tv.tag_other.stamp == -1) break; + gtk_tree_store_append(doc_list[idx].tag_store, &iter, &(tv.tag_other)); + gtk_tree_store_set(doc_list[idx].tag_store, &iter, 0, ((GeanySymbol*)tmp->data)->str, -1); + } + } + } + gtk_tree_view_set_model(GTK_TREE_VIEW(doc_list[idx].tag_tree), model); // Re-attach model to view + g_object_unref(model); + gtk_tree_view_expand_all(GTK_TREE_VIEW(doc_list[idx].tag_tree)); + return TRUE; +} + + Modified: trunk/src/symbols.h =================================================================== --- trunk/src/symbols.h 2007-01-13 12:42:12 UTC (rev 1178) +++ trunk/src/symbols.h 2007-01-13 13:25:05 UTC (rev 1179) @@ -46,4 +46,6 @@ void symbols_finalize(); +gboolean symbols_recreate_tag_list(gint idx); + #endif Modified: trunk/src/ui_utils.c =================================================================== --- trunk/src/ui_utils.c 2007-01-13 12:42:12 UTC (rev 1178) +++ trunk/src/ui_utils.c 2007-01-13 13:25:05 UTC (rev 1179) @@ -199,101 +199,6 @@ } -static gboolean recreate_tag_list(gint idx) -{ - GList *tmp; - const GList *tags; - GtkTreeIter iter; - GtkTreeModel *model; - - tags = symbols_get_tag_list(idx, tm_tag_max_t); - if (doc_list[idx].tm_file == NULL || tags == NULL) return FALSE; - - doc_list[idx].has_tags = TRUE; - gtk_tree_store_clear(doc_list[idx].tag_store); - // unref the store to speed up the filling(from TreeView Tutorial) - model = gtk_tree_view_get_model(GTK_TREE_VIEW(doc_list[idx].tag_tree)); - g_object_ref(model); // Make sure the model stays with us after the tree view unrefs it - gtk_tree_view_set_model(GTK_TREE_VIEW(doc_list[idx].tag_tree), NULL); // Detach model from view - - treeviews_init_tag_list(idx); - for (tmp = (GList*)tags; tmp; tmp = g_list_next(tmp)) - { - switch (((GeanySymbol*)tmp->data)->type) - { - case tm_tag_prototype_t: - case tm_tag_method_t: - case tm_tag_function_t: - { - if (tv.tag_function.stamp == -1) break; - gtk_tree_store_append(doc_list[idx].tag_store, &iter, &(tv.tag_function)); - gtk_tree_store_set(doc_list[idx].tag_store, &iter, 0, ((GeanySymbol*)tmp->data)->str, -1); - break; - } - case tm_tag_macro_t: - case tm_tag_macro_with_arg_t: - { - if (tv.tag_macro.stamp == -1) break; - gtk_tree_store_append(doc_list[idx].tag_store, &iter, &(tv.tag_macro)); - gtk_tree_store_set(doc_list[idx].tag_store, &iter, 0, ((GeanySymbol*)tmp->data)->str, -1); - break; - } - case tm_tag_class_t: - { - if (tv.tag_class.stamp == -1) break; - gtk_tree_store_append(doc_list[idx].tag_store, &iter, &(tv.tag_class)); - gtk_tree_store_set(doc_list[idx].tag_store, &iter, 0, ((GeanySymbol*)tmp->data)->str, -1); - break; - } - case tm_tag_member_t: - case tm_tag_field_t: - { - if (tv.tag_member.stamp == -1) break; - gtk_tree_store_append(doc_list[idx].tag_store, &iter, &(tv.tag_member)); - gtk_tree_store_set(doc_list[idx].tag_store, &iter, 0, ((GeanySymbol*)tmp->data)->str, -1); - break; - } - case tm_tag_typedef_t: - case tm_tag_enum_t: - case tm_tag_union_t: - case tm_tag_struct_t: - case tm_tag_interface_t: - { - if (tv.tag_struct.stamp == -1) break; - gtk_tree_store_append(doc_list[idx].tag_store, &iter, &(tv.tag_struct)); - gtk_tree_store_set(doc_list[idx].tag_store, &iter, 0, ((GeanySymbol*)tmp->data)->str, -1); - break; - } - case tm_tag_variable_t: - { - if (tv.tag_variable.stamp == -1) break; - gtk_tree_store_append(doc_list[idx].tag_store, &iter, &(tv.tag_variable)); - gtk_tree_store_set(doc_list[idx].tag_store, &iter, 0, ((GeanySymbol*)tmp->data)->str, -1); - break; - } - case tm_tag_namespace_t: - case tm_tag_package_t: - { - if (tv.tag_namespace.stamp == -1) break; - gtk_tree_store_append(doc_list[idx].tag_store, &iter, &(tv.tag_namespace)); - gtk_tree_store_set(doc_list[idx].tag_store, &iter, 0, ((GeanySymbol*)tmp->data)->str, -1); - break; - } - default: - { - if (tv.tag_other.stamp == -1) break; - gtk_tree_store_append(doc_list[idx].tag_store, &iter, &(tv.tag_other)); - gtk_tree_store_set(doc_list[idx].tag_store, &iter, 0, ((GeanySymbol*)tmp->data)->str, -1); - } - } - } - gtk_tree_view_set_model(GTK_TREE_VIEW(doc_list[idx].tag_tree), model); // Re-attach model to view - g_object_unref(model); - gtk_tree_view_expand_all(GTK_TREE_VIEW(doc_list[idx].tag_tree)); - return TRUE; -} - - // update = rescan the tags for document[idx].filename void ui_update_tag_list(gint idx, gboolean update) { @@ -304,6 +209,7 @@ { GtkTreeIter iter; GtkTreeStore *store = gtk_tree_store_new(1, G_TYPE_STRING); + app->default_tag_tree = gtk_tree_view_new(); treeviews_prepare_taglist(app->default_tag_tree, store); gtk_tree_store_append(store, &iter, NULL); @@ -331,29 +237,18 @@ g_object_ref((gpointer)doc_list[idx].tag_tree); // to hold it after removing } - if (recreate_tag_list(idx)) - { - gtk_widget_set_sensitive(app->tagbar, TRUE); - gtk_container_add(GTK_CONTAINER(app->tagbar), doc_list[idx].tag_tree); - } - else - { // no tags - gtk_widget_set_sensitive(app->tagbar, FALSE); - gtk_container_add(GTK_CONTAINER(app->tagbar), app->default_tag_tree); - } + doc_list[idx].has_tags = symbols_recreate_tag_list(idx); } + + if (doc_list[idx].has_tags) + { + gtk_widget_set_sensitive(app->tagbar, TRUE); + gtk_container_add(GTK_CONTAINER(app->tagbar), doc_list[idx].tag_tree); + } else - { // update == FALSE - if (doc_list[idx].has_tags) - { - gtk_widget_set_sensitive(app->tagbar, TRUE); - gtk_container_add(GTK_CONTAINER(app->tagbar), doc_list[idx].tag_tree); - } - else - { - gtk_widget_set_sensitive(app->tagbar, FALSE); - gtk_container_add(GTK_CONTAINER(app->tagbar), app->default_tag_tree); - } + { + gtk_widget_set_sensitive(app->tagbar, FALSE); + gtk_container_add(GTK_CONTAINER(app->tagbar), app->default_tag_tree); } } Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2007-01-13 12:42:12 UTC (rev 1178) +++ trunk/src/utils.c 2007-01-13 13:25:05 UTC (rev 1179) @@ -1064,15 +1064,6 @@ } -/* wrapper function to let strcmp work with GeanySymbol struct */ -gint utils_compare_symbol(const GeanySymbol *a, const GeanySymbol *b) -{ - if (a == NULL || b == NULL) return 0; - - return strcmp(a->str, b->str); -} - - gchar *utils_get_hex_from_color(GdkColor *color) { gchar *buffer = g_malloc0(9); Modified: trunk/src/utils.h =================================================================== --- trunk/src/utils.h 2007-01-13 12:42:12 UTC (rev 1178) +++ trunk/src/utils.h 2007-01-13 13:25:05 UTC (rev 1179) @@ -108,8 +108,6 @@ void utils_replace_filename(gint idx); -gint utils_compare_symbol(const GeanySymbol *a, const GeanySymbol *b); - gchar *utils_get_hex_from_color(GdkColor *color); gchar *utils_get_current_file_dir(); 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
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits January 2007