diff options
| author | scuri <scuri> | 2009-08-05 18:44:49 +0000 |
|---|---|---|
| committer | scuri <scuri> | 2009-08-05 18:44:49 +0000 |
| commit | 4eb6a7ae0fa0fa11c7e538b948af1417764d4134 (patch) | |
| tree | a250d2807e85c463ec52eee34d90e9239ec1a384 | |
| parent | e2b3655c339d18b91cc3c824b04fe7a57d51bdfe (diff) | |
*** empty log message ***
| -rw-r--r-- | html/en/func/init.html | 2 | ||||
| -rw-r--r-- | html/en/func/other.html | 5 | ||||
| -rw-r--r-- | html/en/func/region.html | 4 | ||||
| -rw-r--r-- | html/en/history.html | 15 | ||||
| -rw-r--r-- | src/lua5/cdlua5.c | 11 | ||||
| -rw-r--r-- | src/lua5/cdlua5_canvas.c | 4 |
6 files changed, 30 insertions, 11 deletions
diff --git a/html/en/func/init.html b/html/en/func/init.html index c6e08b3..9cdee9e 100644 --- a/html/en/func/init.html +++ b/html/en/func/init.html @@ -105,7 +105,7 @@ canvas:Deactivate(canvas: cdCanvas) [in Lua]</pre> <a href="control.html#cdFlush">Flush</a>.</p> <pre class="function"><span class="mainFunction">int <a name="cdUseContextPlus">cdUseContextPlus</a>(int use); [in C]</span> -cd.UseContextPlus(use: number) -> (old_use: number) [in Lua]</pre> +cd.UseContextPlus(use: boolean) -> (old_use: boolean) [in Lua]</pre> <p>Activates or deactivates the use of an external context for the next calls of the <font face="Courier"><b> <a href="../func/init.html#cdCreateCanvas">cdCreateCanvas</a></b></font> function.</p> diff --git a/html/en/func/other.html b/html/en/func/other.html index af611ef..b493ae5 100644 --- a/html/en/func/other.html +++ b/html/en/func/other.html @@ -96,8 +96,9 @@ cd.ContextRegisterCallback(ctx, cb: number, func: function) -> (status: numbe <p>Used to customize the behavior of the <b><font>Play</font></b> function. If you register a known callback function, it will be called during - the processing loop of <font>cdPlay</font>.</p> - <p>The callback should return <font>CD_CONTINUE</font>, if it + the processing loop of <font><strong>cdCanvasPlay</strong></font>. Returns + CD_OK if the specified callback is supported or CD_ERROR otherwise.</p> + <p>The callback itself should return <font>CD_CONTINUE</font>, if it returns <font>CD_ABORT</font>, the <font>cdPlay</font> function is aborted. The callback identifiers of a given driver must be in the header file relative to that driver, with prefix "<font>CD_XXYYYCB</font>", diff --git a/html/en/func/region.html b/html/en/func/region.html index e503733..1581180 100644 --- a/html/en/func/region.html +++ b/html/en/func/region.html @@ -51,8 +51,10 @@ canvas:RegionCombineMode(mode: number) -> (old_mode: number) [in Lua]</pre> </font><img src="../../img/regions.gif" border="2" width="297" height="361"></p> <pre class="function"><span class="mainFunction">int cdCanvasIsPointInRegion(cdCanvas* canvas, int x, int y); [in C]</span> +int wdCanvasIsPointInRegion(cdCanvas* canvas, double x, double y); (WC) [in C] -canvas:IsPointInRegion(x, y: number) -> (status: number) [in Lua]</pre> +canvas:IsPointInRegion(x, y: number) -> (status: boolean) [in Lua] +canvas:wIsPointInRegion(x, y: number) -> (status: boolean) [in Lua]</pre> <p>Returns a non zero value if the point is contained inside the current region.</p> diff --git a/html/en/history.html b/html/en/history.html index 439ff66..1ece026 100644 --- a/html/en/history.html +++ b/html/en/history.html @@ -5,11 +5,26 @@ <meta http-equiv="Content-Language" content="en-us"> <title>History</title> <link rel="stylesheet" type="text/css" href="../style.css"> +<style type="text/css"> +.hist_changed { + color: #008000; + font-weight: bold; +} +.style1 { + color: #008000; +} +</style> </head> <body> <h1>History of Changes</h1> +<h3>CVS (05/Aug/2008)</h3> +<ul> + <li><span class="style1">Changed</span><span class="hist_changed">:</span> + return value to boolean of <strong>CanvasIsPointInRegion</strong> and + <strong>cd.UseContextPlus</strong> in Lua.</li> +</ul> <h3>Version 5.2 (26/Jun/2008)</h3> <ul> <li><span style="color: #0000FF">New:</span> functions <strong> diff --git a/src/lua5/cdlua5.c b/src/lua5/cdlua5.c index 7b7b617..bff00df 100644 --- a/src/lua5/cdlua5.c +++ b/src/lua5/cdlua5.c @@ -900,7 +900,7 @@ static int cdlua5_version(lua_State *L) \***************************************************************************/ static int cdlua5_registercallback(lua_State *L) { - int cb_i, func_lock; + int cb_i, func_lock, ret = CD_ERROR; cdluaCallback* cdCB; cdluaContext* cdlua_ctx; @@ -926,7 +926,7 @@ static int cdlua5_registercallback(lua_State *L) cdCB->lock = func_lock; if (func_lock == -1) { - cdContextRegisterCallback(cdlua_ctx->ctx(), cb_i, NULL); + ret = cdContextRegisterCallback(cdlua_ctx->ctx(), cb_i, NULL); } } else @@ -934,10 +934,11 @@ static int cdlua5_registercallback(lua_State *L) if (func_lock != -1) { cdContextRegisterCallback(cdlua_ctx->ctx(), cb_i, (cdCallback)cdCB->func); - cdCB->lock = func_lock; + ret = cdCB->lock = func_lock; } } - return 0; + lua_pushnumber(L, ret); + return 1; } @@ -1257,7 +1258,7 @@ static int cdlua5_getscreensize(lua_State *L) \***************************************************************************/ static int cdlua5_usecontextplus(lua_State *L) { - lua_pushnumber(L, cdUseContextPlus(luaL_checkint(L, 1))); + lua_pushboolean(L, cdUseContextPlus(lua_toboolean(L, 1))); return 1; } diff --git a/src/lua5/cdlua5_canvas.c b/src/lua5/cdlua5_canvas.c index d04f76f..eeecc6d 100644 --- a/src/lua5/cdlua5_canvas.c +++ b/src/lua5/cdlua5_canvas.c @@ -712,7 +712,7 @@ static int cdlua5_regioncombinemode(lua_State *L) \***************************************************************************/ static int cdlua5_pointinregion(lua_State *L) { - lua_pushnumber(L, cdCanvasIsPointInRegion(cdlua_checkcanvas(L, 1), luaL_checkint(L, 2), luaL_checkint(L, 3))); + lua_pushboolean(L, cdCanvasIsPointInRegion(cdlua_checkcanvas(L, 1), luaL_checkint(L, 2), luaL_checkint(L, 3))); return 1; } @@ -721,7 +721,7 @@ static int cdlua5_pointinregion(lua_State *L) \***************************************************************************/ static int wdlua5_pointinregion(lua_State *L) { - lua_pushnumber(L, wdCanvasIsPointInRegion(cdlua_checkcanvas(L, 1), luaL_checknumber(L, 2), luaL_checknumber(L, 3))); + lua_pushboolean(L, wdCanvasIsPointInRegion(cdlua_checkcanvas(L, 1), luaL_checknumber(L, 2), luaL_checknumber(L, 3))); return 1; } |