SF.net SVN: geany-plugins:[908] trunk/geany-plugins/geanylua
ntrel at users.sourceforge.net
ntrel at xxxxx
Fri Aug 28 12:23:10 UTC 2009
Revision: 908
http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=908&view=rev
Author: ntrel
Date: 2009-08-28 12:23:10 +0000 (Fri, 28 Aug 2009)
Log Message:
-----------
Upgrade to API 153 except for plugin_key_group change (TODO). This
removes the "make" tool field, "exec" project field, "BUILD_RUN2"
keybinding, filetype build commands - the latter might be readded
if/when the API makes it possible.
Modified Paths:
--------------
trunk/geany-plugins/geanylua/ChangeLog
trunk/geany-plugins/geanylua/docs/geanylua-ref.html
trunk/geany-plugins/geanylua/glspi_app.c
trunk/geany-plugins/geanylua/glspi_doc.c
trunk/geany-plugins/geanylua/glspi_keycmd.h
trunk/geany-plugins/geanylua/glspi_ver.h
Modified: trunk/geany-plugins/geanylua/ChangeLog
===================================================================
--- trunk/geany-plugins/geanylua/ChangeLog 2009-08-26 21:15:44 UTC (rev 907)
+++ trunk/geany-plugins/geanylua/ChangeLog 2009-08-28 12:23:10 UTC (rev 908)
@@ -1,3 +1,9 @@
+August 28, 2009 (ntrel)
+ Upgrade to API 153 except for plugin_key_group change (TODO). This
+ removes the "make" tool field, "exec" project field, "BUILD_RUN2"
+ keybinding, filetype build commands - the latter might be readded
+ if/when the API makes it possible.
+
July 15, 2009 (ntrel)
Update to API 146 (but require 147).
Modified: trunk/geany-plugins/geanylua/docs/geanylua-ref.html
===================================================================
--- trunk/geany-plugins/geanylua/docs/geanylua-ref.html 2009-08-26 21:15:44 UTC (rev 907)
+++ trunk/geany-plugins/geanylua/docs/geanylua-ref.html 2009-08-28 12:23:10 UTC (rev 908)
@@ -321,7 +321,7 @@
<td class="desc">-- The window title for all dialogs.</td>
</tr>
</table><br>
-If you need a more advanced dialog creation API, check out the
+If you need a more advanced dialog creation API, check out the
<tt><big><a href="geanylua-input.html">dialog</a></big></tt> module.
<br><br><br>
<hr>
@@ -364,7 +364,6 @@
<br>
<table border="0" summary="tools table fields">
<tr><td width="15%"></td><td><tt>browser</tt> </td></tr>
-<tr><td width="15%"></td><td><tt>make</tt> </td></tr>
<tr><td width="15%"></td><td><tt>term</tt> </td><td></tr>
<tr><td width="15%"></td><td><tt>print</tt> </td></tr>
<tr><td width="15%"></td><td><tt>grep</tt> </td></tr>
@@ -390,7 +389,6 @@
<tr><td width="15%"></td><td><tt>desc</tt> </td><td> -- Project description.</td></tr>
<tr><td width="15%"></td><td><tt>file</tt> </td><td> -- Project filename.</td></tr>
<tr><td width="15%"></td><td><tt>base</tt> </td><td> -- Base path of project files.</td></tr>
-<tr><td width="15%"></td><td><tt>exec</tt> </td><td> -- Default "run" command.</td></tr>
<tr><td width="15%"></td><td><tt>mask</tt> </td><td> -- Semicolon-delimited list of filetypes.</td></tr>
</table>
<p>
@@ -535,10 +533,12 @@
<tr><td width="5%"></td><td><tt>opener</tt> </td><td> -- The string used to begin a comment, e.g. "<b class="desc"><!--</b>".</td></tr>
<tr><td width="5%"></td><td><tt>closer</tt> </td><td> -- The string used to end a comment, e.g. "<b class="desc">--></b>".</td></tr>
<tr><td width="5%"></td><td><tt>action</tt> </td><td> -- The action command as executed by the context menu</td></tr>
+<!--
<tr><td width="5%"></td><td><tt>compiler</tt> </td><td> -- The command used to compile this type of file.</td></tr>
<tr><td width="5%"></td><td><tt>linker</tt> </td><td> -- The command used to link this type of file.</td></tr>
<tr><td width="5%"></td><td><tt>exec</tt> </td><td> -- The primary command used to execute this type of file.</td></tr>
<tr><td width="5%"></td><td><tt>exec2</tt> </td><td> -- An alternative command used to execute this type of file.</td></tr>
+-->
<tr><td width="5%"></td><td><tt>ftid</tt> </td><td> -- The unique numeric filetype identifier, as used by Geany.</td></tr>
<tr><td width="5%"></td><td><tt>encoding</tt> </td><td> -- The file's in-memory encoding. (may differ from the on-disk encoding.)</td></tr>
<tr><td width="5%"></td><td><tt>bom</tt> </td><td> -- <tt><b>true</b></tt> if the file contains a <b>B</b>yte-<b>O</b>rder <b>M</b>arker.</td></tr>
@@ -573,8 +573,8 @@
</td></tr>
<tr><td> </td><td><tt>
"posix" </tt> </td><td> -- Use bare parentheses
-<tt><b>(</b></tt>
-<tt><b>)</b></tt>
+<tt><b>(</b></tt>
+<tt><b>)</b></tt>
for tagged sections rather than the escaped <tt><b>\(</b></tt> and <tt><b>\)</b></tt>.
</td></tr>
<tr><td colspan="3">
@@ -851,20 +851,20 @@
Sends a <tt><b>SCI_*</b></tt> message directly to the Scintilla widget of the active document.</p>
<p>
The <tt><b>msg_id</b></tt> can be a numeric value, or a case-insensitive string with or
-without the <tt>"SCI_"</tt> prefix,
+without the <tt>"SCI_"</tt> prefix,
such as <tt>"SCI_POSITIONFROMPOINT"</tt>, <tt>"POSITIONFROMPOINT"</tt>, or <tt>"PositionFromPoint"</tt>.
</p><p>
The wparam, lparam, and return types depend on the particular message, based on the
interface described in the "<tt><small>Scintilla.iface</small></tt>" file from the Scintilla sources.
</p><p>
-For API calls which expect a pre-allocated char buffer as the lparam, the allocation is
-automatically managed
-by the GeanyLua module, your lparam is ignored, and the return value is a Lua string.
-In cases where the length is specified
+For API calls which expect a pre-allocated char buffer as the lparam, the allocation is
+automatically managed
+by the GeanyLua module, your lparam is ignored, and the return value is a Lua string.
+In cases where the length is specified
in the wparam, the null terminator is not counted - if you ask for 3 chars, you get 3 chars.
</p><p>
Currently only string, numeric, and boolean types are supported, any API call that
-expects or returns complex types will result in an error. This function tries hard to
+expects or returns complex types will result in an error. This function tries hard to
protect from garbage being passed to
Scintilla, but ultimately <i>you</i> are expected to know what you're doing!
</p><br><br>
@@ -886,7 +886,7 @@
<br> The selection is <i>anchored</i> at the <tt><b>start</b></tt>
position, and <i>extended</i> to the <tt><b>stop</b></tt> position.</p><p>
The boolean variable <tt><b>geany.rectsel</b></tt> can be set prior to this
-call to control
+call to control
whether this selection is created in normal or rectangular mode.
</p>
<p><br>
@@ -924,12 +924,12 @@
The <tt>signal</tt> argument is a string identifying the signal to be emitted.
</p><p>
This function was primarily intended for activating Geany's builtin menu commands.<br>
-For instance, to display the file open dialog you could do:<br>
+For instance, to display the file open dialog you could do:<br>
<tt> geany.signal("menu_open1", "activate")</tt>
</p><p>
The function does not return a value, but may trigger an error message if the
widget name is not found or the signal name is not valid for the specified widget.
-
+
Note that it is generally easier and more reliable to use the <tt>keycmd()</tt> function whenever possible.
</p><br><br>
@@ -983,7 +983,7 @@
Attempts to control the maximum time allowed, in whole seconds, for the current script to
finish execution.</p><p>
By default, scripts are allowed 15 seconds to complete, but if your script needs
-more time, you can increase it here.
+more time, you can increase it here.
</p><p>
Note that the interpreter is only able to trigger this "timeout exceeded" error when it is actually processing instructions.
This provides protection against things like accidentally creating an endless loop,
@@ -1120,13 +1120,13 @@
or it can be <tt>nil</tt> to display all files.<br>
It is a string consisting of pairs of substrings, where each substring
is separated by the pipe "<tt>|</tt>" symbol.<br>
-The first element in each pair of substrings is the human-readable description of the filetype,<br>
-and the second element of the
+The first element in each pair of substrings is the human-readable description of the filetype,<br>
+and the second element of the
pair is a set of semicolon-delimited shell wildcards to filter on.<br>
For instance, a filter for web files might look like:<br>
<tt><b> "HTML files|*.html;*.htm|PHP files|*.php;*.php4|Style sheets|*.css"</b></tt>
<br>
-( Those familiar with
+( Those familiar with
<a href="http://en.wikipedia.org/wiki/Borland_Delphi">Borland Delphi</a>
might recognize this syntax from the
<a href="http://www.delphibasics.co.uk/RTL.asp?Name=TOpenDialog">TOpenDialog.Filter</a> property. )
Modified: trunk/geany-plugins/geanylua/glspi_app.c
===================================================================
--- trunk/geany-plugins/geanylua/glspi_app.c 2009-08-26 21:15:44 UTC (rev 907)
+++ trunk/geany-plugins/geanylua/glspi_app.c 2009-08-28 12:23:10 UTC (rev 908)
@@ -30,7 +30,6 @@
{
lua_newtable(L);
SetTableStr("browser", geany_data->tool_prefs->browser_cmd);
- SetTableStr("make", geany_data->tool_prefs->make_cmd);
SetTableStr("term", geany_data->tool_prefs->term_cmd);
SetTableStr("grep", geany_data->tool_prefs->grep_cmd);
SetTableStr("action", geany_data->tool_prefs->context_action_cmd);
@@ -54,14 +53,13 @@
static gint glspi_project(lua_State* L)
{
GeanyProject *project = geany->app->project;
-
+
if (project) {
lua_newtable(L);
SetTableStr("name", project->name);
SetTableStr("desc", project->description);
SetTableStr("file", project->file_name);
SetTableStr("base", project->base_path);
- SetTableStr("exec", project->run_cmd);
if (project->file_patterns && *project->file_patterns) {
gchar *tmp=g_strjoinv(";", project->file_patterns);
SetTableStr("mask", tmp);
@@ -78,7 +76,7 @@
static gint glspi_appinfo(lua_State* L)
{
GeanyApp *app = geany->app;
-
+
lua_newtable(L);
SetTableBool("debug", app->debug_mode);
SetTableStr("configdir", app->configdir);
Modified: trunk/geany-plugins/geanylua/glspi_doc.c
===================================================================
--- trunk/geany-plugins/geanylua/glspi_doc.c 2009-08-26 21:15:44 UTC (rev 907)
+++ trunk/geany-plugins/geanylua/glspi_doc.c 2009-08-28 12:23:10 UTC (rev 908)
@@ -308,10 +308,12 @@
SetTableStr("opener", FileTypeStr(comment_open));
SetTableStr("closer", FileTypeStr(comment_close));
SetTableStr("action", FileTypeStr(context_action_cmd));
+/*
SetTableStr("compiler", BuildCmdStr(compiler));
SetTableStr("linker", BuildCmdStr(linker));
SetTableStr("exec", BuildCmdStr(run_cmd));
SetTableStr("exec2", BuildCmdStr(run_cmd2));
+*/
SetTableNum("ftid", GPOINTER_TO_INT(doc->file_type?doc->file_type->id:GEANY_FILETYPES_NONE));
SetTableStr("encoding", StrField(doc,encoding));
SetTableBool("bom",doc->has_bom);
Modified: trunk/geany-plugins/geanylua/glspi_keycmd.h
===================================================================
--- trunk/geany-plugins/geanylua/glspi_keycmd.h 2009-08-26 21:15:44 UTC (rev 907)
+++ trunk/geany-plugins/geanylua/glspi_keycmd.h 2009-08-28 12:23:10 UTC (rev 908)
@@ -127,7 +127,6 @@
{"BUILD_MAKEOBJECT", GEANY_KEY_GROUP_BUILD, GEANY_KEYS_BUILD_MAKEOBJECT},
{"BUILD_NEXTERROR", GEANY_KEY_GROUP_BUILD, GEANY_KEYS_BUILD_NEXTERROR},
{"BUILD_RUN", GEANY_KEY_GROUP_BUILD, GEANY_KEYS_BUILD_RUN},
- {"BUILD_RUN2", GEANY_KEY_GROUP_BUILD, GEANY_KEYS_BUILD_RUN2},
{"BUILD_OPTIONS", GEANY_KEY_GROUP_BUILD, GEANY_KEYS_BUILD_OPTIONS},
{"BUILD_COUNT", GEANY_KEY_GROUP_BUILD, GEANY_KEYS_BUILD_COUNT},
{"TOOLS_OPENCOLORCHOOSER", GEANY_KEY_GROUP_TOOLS, GEANY_KEYS_TOOLS_OPENCOLORCHOOSER},
Modified: trunk/geany-plugins/geanylua/glspi_ver.h
===================================================================
--- trunk/geany-plugins/geanylua/glspi_ver.h 2009-08-26 21:15:44 UTC (rev 907)
+++ trunk/geany-plugins/geanylua/glspi_ver.h 2009-08-28 12:23:10 UTC (rev 908)
@@ -12,7 +12,7 @@
#define PLUGIN_AUTHOR "Jeff Pohlmeyer"
-#define MY_GEANY_API_VER 147
+#define MY_GEANY_API_VER 153
#define LUA_MODULE_NAME "geany"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Plugins-Commits
mailing list