OSDN -- Développer et télécharger des logiciels Open Source
Traduction statut du Français translation status for fr

[Ttssh2-commit] [4901] ・ダイアログから . ttlファイルが読み込まれた場合も paramcnt を更新するようにした。

Back to archive index

svnno****@sourc***** svnno****@sourc*****
2012年 4月 14日 (土) 20:41:44 JST 

Revision: 4901
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4901
Author:   yutakapon
Date:     2012-04-14 20:41:44 +0900 (Sat, 14 Apr 2012)
Log Message:
-----------
・ダイアログから.ttlファイルが読み込まれた場合も paramcnt を更新するようにした。
・"param1"変数の追加。マクロファイル名が格納される。
　ただし、.ttlファイルをincludeしても、当該変数の内容は変わらない。
cf.
http://twitter.com/#!/ttdoda/status/190747189696397313

Modified Paths:
--------------
    trunk/doc/en/html/macro/commandline.html
    trunk/doc/en/html/macro/syntax/variables.html
    trunk/doc/ja/html/macro/commandline.html
    trunk/doc/ja/html/macro/syntax/variables.html
    trunk/teraterm/ttpmacro/ttl.c
    trunk/teraterm/ttpmacro/ttmdlg.cpp
    trunk/teraterm/ttpmacro/ttmparse.c

-------------- next part --------------
Modified: trunk/doc/en/html/macro/commandline.html
===================================================================
--- trunk/doc/en/html/macro/commandline.html	2012-04-14 09:03:55 UTC (rev 4900)
+++ trunk/doc/en/html/macro/commandline.html	2012-04-14 11:41:44 UTC (rev 4901)
@@ -28,7 +28,8 @@
 
   <dt>&lt;macro file&gt;</dt>
   <dd>Macro filename.<br>
-      If this value is not a full path, it is understood as a relative path from ttpmacro.exe.</dd>
+      If this value is not a full path, it is understood as a relative path from ttpmacro.exe.<br>
+      The filename(path excluded) is stored in the system variable "param1".</dd>
 
   <dt>&lt;second param&gt;</dt>
   <dd>Character string stored in the system variable "param2".</dd>
@@ -55,11 +56,11 @@
   <dd>Character string stored in the system variable "param9".</dd>
 
   <dt>paramcnt</dt>
-  <dd>"Count of the string stored in the system variable param[2-9]" - 1</dd>
+  <dd>"Count of the string stored in the system variable param1..9"</dd>
 </dl>
 
 <p>
-See <A HREF="./syntax/variables.html">"Variables"</A> for the system variables "param2" to "param9", "paramcnt".
+See <A HREF="./syntax/variables.html">"Variables"</A> for the system variables "param1", "param2" to "param9", "paramcnt".
 </p>
 
 

Modified: trunk/doc/en/html/macro/syntax/variables.html
===================================================================
--- trunk/doc/en/html/macro/syntax/variables.html	2012-04-14 09:03:55 UTC (rev 4900)
+++ trunk/doc/en/html/macro/syntax/variables.html	2012-04-14 11:41:44 UTC (rev 4901)
@@ -63,7 +63,7 @@
     </td>
   </tr>
   <tr>
-    <td>param2 ... param9, paramcnt</td>
+    <td>param1, param2 ... param9, paramcnt</td>
     <td>string, interger</td>
     <td>*1</td>
     <td>*1</td>
@@ -155,7 +155,7 @@
 </table>
 
 <p>
-*1 The second to ninth command line parameter of MACRO. The first parameter (param1) is missing number becase it is the macro file name. "paramcnt" is a number of parameter counter including the fisrt parameter. See "<A HREF="../commandline.html">Command line</A>".<br>
+*1 The second to ninth command line parameter of MACRO. The first parameter (param1) is the macro file name. "paramcnt" is a number of parameter counter including the fisrt parameter. See "<A HREF="../commandline.html">Command line</A>".<br>
 *2 Precision is about 50 msec.
 </p>
 

Modified: trunk/doc/ja/html/macro/commandline.html
===================================================================
--- trunk/doc/ja/html/macro/commandline.html	2012-04-14 09:03:55 UTC (rev 4900)
+++ trunk/doc/ja/html/macro/commandline.html	2012-04-14 11:41:44 UTC (rev 4901)
@@ -28,7 +28,9 @@
 
   <dt>&lt;macro file&gt;</dt>
   <dd>\x83}\x83N\x83\x8D\x83t\x83@\x83C\x83\x8B\x96\xBC<br>
-      \x83t\x83@\x83C\x83\x8B\x96\xBC\x82\xAA\x90\xE2\x91΃p\x83X\x82łȂ\xA2\x82Ƃ\xAB\x82́Attpmacro.exe \x82\xA9\x82\xE7\x82̑\x8A\x91΃p\x83X\x82ƌ\xA9\x82Ȃ\xB3\x82\xEA\x82܂\xB7\x81B</dd>
+      \x83t\x83@\x83C\x83\x8B\x96\xBC\x82\xAA\x90\xE2\x91΃p\x83X\x82łȂ\xA2\x82Ƃ\xAB\x82́Attpmacro.exe \x82\xA9\x82\xE7\x82̑\x8A\x91΃p\x83X\x82ƌ\xA9\x82Ȃ\xB3\x82\xEA\x82܂\xB7\x81B<br>
+      \x83t\x83@\x83C\x83\x8B\x96\xBC\x81i\x83p\x83X\x82\xF0\x8F\x9C\x82\xAD\x81j\x82̓V\x83X\x83e\x83\x80\x95ϐ\x94 param1 \x82Ɋi\x94[\x82\xB3\x82\xEA\x82\xE9\x81B
+      </dd>
 
   <dt>&lt;second param&gt;</dt>
   <dd>\x83V\x83X\x83e\x83\x80\x95ϐ\x94 param2 \x82Ɋi\x94[\x82\xB3\x82\xEA\x82镶\x8E\x9A\x97\xF1</dd>
@@ -55,11 +57,11 @@
   <dd>\x83V\x83X\x83e\x83\x80\x95ϐ\x94 param9 \x82Ɋi\x94[\x82\xB3\x82\xEA\x82镶\x8E\x9A\x97\xF1</dd>
 
   <dt>paramcnt</dt>
-  <dd>\x83V\x83X\x83e\x83\x80\x95ϐ\x94 param[2-9] \x82Ɋi\x94[\x82\xB3\x82ꂽ\x95\xB6\x8E\x9A\x97\xF1\x82̌\x94 - 1</dd>
+  <dd>\x83V\x83X\x83e\x83\x80\x95ϐ\x94 param1..9 \x82Ɋi\x94[\x82\xB3\x82ꂽ\x95\xB6\x8E\x9A\x97\xF1\x82̌\x94</dd>
 </dl>
 
 <p>
-\x83V\x83X\x83e\x83\x80\x95ϐ\x94 param2 \x81` param9, paramcnt \x82ɂ‚\xA2\x82Ă\xCD<A HREF="./syntax/variables.html">"\x95ϐ\x94"</A> \x8EQ\x8FƁB
+\x83V\x83X\x83e\x83\x80\x95ϐ\x94 param1, param2 \x81` param9, paramcnt \x82ɂ‚\xA2\x82Ă\xCD<A HREF="./syntax/variables.html">"\x95ϐ\x94"</A> \x8EQ\x8FƁB
 </p>
 
 

Modified: trunk/doc/ja/html/macro/syntax/variables.html
===================================================================
--- trunk/doc/ja/html/macro/syntax/variables.html	2012-04-14 09:03:55 UTC (rev 4900)
+++ trunk/doc/ja/html/macro/syntax/variables.html	2012-04-14 11:41:44 UTC (rev 4901)
@@ -63,7 +63,7 @@
     </td>
   </tr>
   <tr>
-    <td>param2 ... param9, paramcnt</td>
+    <td>param1, param2 ... param9, paramcnt</td>
     <td>\x95\xB6\x8E\x9A\x97\xF1\x81A\x90\xAE\x90\x94</td>
     <td>*1</td>
     <td>*1</td>
@@ -156,7 +156,7 @@
 </table>
 
 <p>
-*1 MACRO \x8BN\x93\xAE\x8E\x9E\x82̃R\x83}\x83\x93\x83h\x83\x89\x83C\x83\x93\x83p\x83\x89\x83\x81\x81[\x83^\x82\xCC2 \x81` 9\x94Ԗڂ\xAA\x83V\x83X\x83e\x83\x80\x95ϐ\x94 param2 \x81` param9 \x82̏\x89\x8A\xFA\x92l\x82ƂȂ\xE9\x81B1\x94Ԗڂ̃p\x83\x89\x83\x81\x81[\x83^(param1)\x82̓}\x83N\x83\x8D\x83t\x83@\x83C\x83\x8B\x96\xBC\x82ƂȂ\xE9\x82̂Ō\x87\x94ԁB"paramcnt"\x82\xCD1\x94Ԗڂ̃p\x83\x89\x83\x81\x81[\x83^\x82\xE0\x8A܂ށA\x88\xF8\x90\x94\x82̌\x94\x81B<A HREF="../commandline.html">"\x83R\x83}\x83\x93\x83h\x83\x89\x83C\x83\x93"</A> \x8EQ\x8FƁB<br>
+*1 MACRO \x8BN\x93\xAE\x8E\x9E\x82̃R\x83}\x83\x93\x83h\x83\x89\x83C\x83\x93\x83p\x83\x89\x83\x81\x81[\x83^\x82\xCC2 \x81` 9\x94Ԗڂ\xAA\x83V\x83X\x83e\x83\x80\x95ϐ\x94 param2 \x81` param9 \x82̏\x89\x8A\xFA\x92l\x82ƂȂ\xE9\x81B1\x94Ԗڂ̃p\x83\x89\x83\x81\x81[\x83^(param1)\x82̓}\x83N\x83\x8D\x83t\x83@\x83C\x83\x8B\x96\xBC\x82ƂȂ\xE9\x81B"paramcnt"\x82\xCD1\x94Ԗڂ̃p\x83\x89\x83\x81\x81[\x83^\x82\xE0\x8A܂ށA\x88\xF8\x90\x94\x82̌\x94\x81B<A HREF="../commandline.html">"\x83R\x83}\x83\x93\x83h\x83\x89\x83C\x83\x93"</A> \x8EQ\x8FƁB<br>
 *2 \x90\xB8\x93x\x82\xCD 50 msec \x92\xF6\x93x\x81B
 </p>
 

Modified: trunk/teraterm/ttpmacro/ttl.c
===================================================================
--- trunk/teraterm/ttpmacro/ttl.c	2012-04-14 09:03:55 UTC (rev 4900)
+++ trunk/teraterm/ttpmacro/ttl.c	2012-04-14 11:41:44 UTC (rev 4901)
@@ -96,6 +96,7 @@
 	NewStrVar("groupmatchstr8","");   // for 'waitregex' command (2005.10.15 yutaka)
 	NewStrVar("groupmatchstr9","");   // for 'waitregex' command (2005.10.15 yutaka)
 
+	NewStrVar("param1",ShortName);  // \x83}\x83N\x83\x8D\x83t\x83@\x83C\x83\x8B\x96\xBC (2012.4.14 yutaka)
 	NewStrVar("param2",Param2);
 	NewStrVar("param3",Param3);
 	NewStrVar("param4",Param4);

Modified: trunk/teraterm/ttpmacro/ttmdlg.cpp
===================================================================
--- trunk/teraterm/ttpmacro/ttmdlg.cpp	2012-04-14 09:03:55 UTC (rev 4900)
+++ trunk/teraterm/ttpmacro/ttmdlg.cpp	2012-04-14 11:41:44 UTC (rev 4901)
@@ -229,6 +229,11 @@
 		return FALSE;
 	}
 	else {
+		/* ttpmacro.exe\x82\xAA\x92P\x91̂ŋN\x93\xAE\x82\xB3\x82\xEA\x81A\x83_\x83C\x83A\x83\x8D\x83O\x82Ń}\x83N\x83\x8D\x83t\x83@\x83C\x83\x8B\x82\xAA\x93ǂݍ\x9E\x82܂ꂽ\x8Fꍇ\x82́A
+		 * \x88\xF8\x90\x94\x82̌\x94\x82\xCD"1"\x82ƂȂ\xE8\x81A"param1"\x82\xAA\x8DX\x90V\x82\xB3\x82\xEA\x82\xE9\x81B
+		 * (2012.4.14 yutaka)
+		 */
+		ParamCnt = 1;
 		return TRUE;
 	}
 }

Modified: trunk/teraterm/ttpmacro/ttmparse.c
===================================================================
--- trunk/teraterm/ttpmacro/ttmparse.c	2012-04-14 09:03:55 UTC (rev 4900)
+++ trunk/teraterm/ttpmacro/ttmparse.c	2012-04-14 11:41:44 UTC (rev 4901)
@@ -33,7 +33,7 @@
 // \x95ϐ\x94\x82̌\x94\x82\xF0128->256\x81A\x83\x89\x83x\x83\x8B\x82̌\x94\x82\xF0256->512\x82֊g\x92\xA3\x82\xB5\x82\xBD\x81B(2006.2.1 yutaka)
 // \x95ϐ\x94\x82̌\x94\x82\xF0\x81AInitTTL \x82ō\xEC\x82\xC1\x82Ă\xA2\x82\xE9\x83V\x83X\x83e\x83\x80\x95ϐ\x94\x82̕\xAA\x82\xBE\x82\xAF\x92lj\xC1\x82\xB5\x82\xBD\x81B(2006.7.26 maya)
 #define MaxNumOfIntVar (LONG)(256+4)
-#define MaxNumOfStrVar (LONG)(256+19)
+#define MaxNumOfStrVar (LONG)(256+20)
 #define MaxNumOfLabVar (LONG)512
 #define MaxNumOfIntAryVar (LONG)256
 #define MaxNumOfStrAryVar (LONG)256


Ttssh2-commit メーリングリストの案内
Back to archive index