svnno****@sourc*****
svnno****@sourc*****
2011年 4月 14日 (木) 00:47:50 JST
Revision: 4440 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4440 Author: maya Date: 2011-04-14 00:47:50 +0900 (Thu, 14 Apr 2011) Log Message: ----------- ä¸æ¬æã ãäºææ§ã®ãã r4079 ã®å¤æ´ãæ»ã box ç³»ãã¯ãã³ãã³ãã® special å¼æ°ã復活 Modified Paths: -------------- trunk/doc/en/html/about/history.html trunk/doc/en/html/macro/command/inputbox.html trunk/doc/en/html/macro/command/messagebox.html trunk/doc/en/html/macro/command/passwordbox.html trunk/doc/en/html/macro/command/statusbox.html trunk/doc/en/html/macro/command/yesnobox.html trunk/doc/ja/html/about/history.html trunk/doc/ja/html/macro/command/inputbox.html trunk/doc/ja/html/macro/command/messagebox.html trunk/doc/ja/html/macro/command/passwordbox.html trunk/doc/ja/html/macro/command/statusbox.html trunk/doc/ja/html/macro/command/yesnobox.html trunk/teraterm/ttpmacro/ttl.c -------------- next part -------------- Modified: trunk/doc/en/html/about/history.html =================================================================== --- trunk/doc/en/html/about/history.html 2011-04-13 15:43:22 UTC (rev 4439) +++ trunk/doc/en/html/about/history.html 2011-04-13 15:47:50 UTC (rev 4440) @@ -46,6 +46,7 @@ <li>DEC special character font can support the bold and the under line attribute.</li> <li>The Meta Key can be only assigned to the left ALT or the right ALT key.</li> <li>added support for the NetTerm style mouse event tracking.</li> + <li>Resurrected the special argument of the box-style macro command.</li> </ul> </li> Modified: trunk/doc/en/html/macro/command/inputbox.html =================================================================== --- trunk/doc/en/html/macro/command/inputbox.html 2011-04-13 15:43:22 UTC (rev 4439) +++ trunk/doc/en/html/macro/command/inputbox.html 2011-04-13 15:47:50 UTC (rev 4440) @@ -18,23 +18,56 @@ </p> <pre class="macro-syntax"> -inputbox <message> <title> [<default> [<special>(obsolete)]] +inputbox <message> <title> [<default> [<special>]] </pre> -<h2>Remarks</h2> +<h2>Parameters</h2> -<p> -The <message> is displayed in the dialog box. The <title> is displayed as the dialog box title. The string entered by the user is returned in the system variable "inputstr". -</p> +<dl> + <dt class="macro">string <message></dt> + <dd>It is displayed in the dialog box.</dd> + + <dt class="macro">string <title></dt> + <dd>It is displayed as the dialog box title.</dd> + + <dt class="macro">string <default> (optional default=''(empty))</dt> + <dd>The default string on edit control.</dd> + + <dt class="macro">integer <special> (optional default=1)</dt> + <dd>If it is non-zero, following strings in <message> is treated as spacial character.<br> + <special> does not effect to <default>.<br> + + <table border="2"> + <tr> + <th>input</th> + <th>output</th> + </tr> + <tr> + <td>\\</td> + <td>"\"</td> + </tr> + <tr> + <td>\n</td> + <td>line feed</td> + </tr> + <tr> + <td>\t</td> + <td>tab</td> + </tr> + </table> + + </dd> -<p> -The <default> is default string on edit control. If it is not specified, ''(empty) is used. -</p> +</dl> -<p> -<special> is an obsolete parameter. It has not effect. -</p> +<h2>Return Value</h2> +<dl> + <dt class="macro">System valiable <inputstr></dt> + <dd>The string entered by the user is returned.</dd> + +</dl> + <h2>Example</h2> <pre class="macro-example"> Modified: trunk/doc/en/html/macro/command/messagebox.html =================================================================== --- trunk/doc/en/html/macro/command/messagebox.html 2011-04-13 15:43:22 UTC (rev 4439) +++ trunk/doc/en/html/macro/command/messagebox.html 2011-04-13 15:47:50 UTC (rev 4440) @@ -18,18 +18,43 @@ </p> <pre class="macro-syntax"> -messagebox <message> <title> [<special>(obsolete)] +messagebox <message> <title> [<special>] </pre> -<h2>Remarks</h2> +<h2>Parameters</h2> -<p> -Displays a dialog box with <message> and <title>. -</p> +<dl> + <dt class="macro">string <message></dt> + <dd>It is displayed in the dialog box.</dd> + + <dt class="macro">string <title></dt> + <dd>It is displayed as the dialog box title.</dd> + + <dt class="macro">integer <special> (optional default=1)</dt> + <dd>If it is non-zero, following strings in <message> is treated as spacial character.<br> + + <table border="2"> + <tr> + <th>input</th> + <th>output</th> + </tr> + <tr> + <td>\\</td> + <td>"\"</td> + </tr> + <tr> + <td>\n</td> + <td>line feed</td> + </tr> + <tr> + <td>\t</td> + <td>tab</td> + </tr> + </table> + + </dd> -<p> -<special> is an obsolete parameter. It has not effect. -</p> +</dl> <h2>Example</h2> Modified: trunk/doc/en/html/macro/command/passwordbox.html =================================================================== --- trunk/doc/en/html/macro/command/passwordbox.html 2011-04-13 15:43:22 UTC (rev 4439) +++ trunk/doc/en/html/macro/command/passwordbox.html 2011-04-13 15:47:50 UTC (rev 4440) @@ -18,22 +18,56 @@ </p> <pre class="macro-syntax"> -passwordbox <message> <title> [<special>(obsolete)] +passwordbox <message> <title> [<special>] </pre> -<h2>Remarks</h2> +<h2>Parameters</h2> -<p> -The <message> is displayed in the dialog box. The <title> is displayed as the dialog box title. -</p> +<dl> + <dt class="macro">string <message></dt> + <dd>It is displayed in the dialog box.</dd> + + <dt class="macro">string <title></dt> + <dd>It is displayed as the dialog box title.</dd> + + <dt class="macro">integer <special> (optional default=1)</dt> + <dd>If it is non-zero, following strings in <message> is treated as spacial character.<br> + + <table border="2"> + <tr> + <th>input</th> + <th>output</th> + </tr> + <tr> + <td>\\</td> + <td>"\"</td> + </tr> + <tr> + <td>\n</td> + <td>line feed</td> + </tr> + <tr> + <td>\t</td> + <td>tab</td> + </tr> + </table> + + </dd> -<p> -The password typed by the user is not displayed as is.<br> -Instead, asterisks are displayed. The password is returned in the system variable "inputstr". -</p> +</dl> +<h2>Return Value</h2> + +<dl> + <dt class="macro">System valiable <inputstr></dt> + <dd>The string entered by the user is returned.</dd> + +</dl> + +<h2>Remarks</h2> + <p> -<special> is an obsolete parameter. It has not effect. +The password typed by the user is not displayed as is. Instead, asterisks are displayed. </p> <h2>Example</h2> Modified: trunk/doc/en/html/macro/command/statusbox.html =================================================================== --- trunk/doc/en/html/macro/command/statusbox.html 2011-04-13 15:43:22 UTC (rev 4439) +++ trunk/doc/en/html/macro/command/statusbox.html 2011-04-13 15:47:50 UTC (rev 4440) @@ -18,9 +18,44 @@ </p> <pre class="macro-syntax"> -statusbox <message> <title> [<special>(obsolete)] +statusbox <message> <title> [<special>] </pre> +<h2>Parameters</h2> + +<dl> + <dt class="macro">string <message></dt> + <dd>It is displayed in the dialog box.</dd> + + <dt class="macro">string <title></dt> + <dd>It is displayed as the dialog box title.</dd> + + <dt class="macro">integer <special> (optional default=1)</dt> + <dd>If it is non-zero, following strings in <message> is treated as spacial character.<br> + + <table border="2"> + <tr> + <th>input</th> + <th>output</th> + </tr> + <tr> + <td>\\</td> + <td>"\"</td> + </tr> + <tr> + <td>\n</td> + <td>line feed</td> + </tr> + <tr> + <td>\t</td> + <td>tab</td> + </tr> + </table> + + </dd> + +</dl> + <h2>Remarks</h2> <p> @@ -33,10 +68,6 @@ The "<a href="closebox.html">closesbox</a>" command closes the status dialog box. A user can not close the status dialog box by using the Enter and ESC key. </p> -<p> -<special> is an obsolete parameter. It has not effect. -</p> - <h2>Example</h2> <pre class="macro-example"> Modified: trunk/doc/en/html/macro/command/yesnobox.html =================================================================== --- trunk/doc/en/html/macro/command/yesnobox.html 2011-04-13 15:43:22 UTC (rev 4439) +++ trunk/doc/en/html/macro/command/yesnobox.html 2011-04-13 15:47:50 UTC (rev 4440) @@ -18,23 +18,53 @@ </p> <pre class="macro-syntax"> -yesnobox <message> <title> [<special>(obsolete)] +yesnobox <message> <title> [<special>] </pre> -<h2>Remarks</h2> +<h2>Parameters</h2> -<p> -Displays a dialog box with the <message>, <title>, "Yes" button and "No" button. -</p> +<dl> + <dt class="macro">string <message></dt> + <dd>It is displayed in the dialog box.</dd> + + <dt class="macro">string <title></dt> + <dd>It is displayed as the dialog box title.</dd> + + <dt class="macro">integer <special> (optional default=1)</dt> + <dd>If it is non-zero, following strings in <message> is treated as spacial character.<br> + + <table border="2"> + <tr> + <th>input</th> + <th>output</th> + </tr> + <tr> + <td>\\</td> + <td>"\"</td> + </tr> + <tr> + <td>\n</td> + <td>line feed</td> + </tr> + <tr> + <td>\t</td> + <td>tab</td> + </tr> + </table> + + </dd> -<p> -If the user clicks on the "Yes" button, the system variable "result" is set to 1. If the user clicks on the "No" button, "result" is set to zero. -</p> +</dl> -<p> -<special> is an obsolete parameter. It has not effect. -</p> +<h2>Return Value</h2> +<dl> + <dt class="macro">System valiable <result></dt> + <dd>If the user clicks on the "Yes" button, it is set to 1.<br> + If the user clicks on the "No" button, it is set to zero.</dd> + +</dl> + <h2>Example</h2> <pre class="macro-example"> Modified: trunk/doc/ja/html/about/history.html =================================================================== --- trunk/doc/ja/html/about/history.html 2011-04-13 15:43:22 UTC (rev 4439) +++ trunk/doc/ja/html/about/history.html 2011-04-13 15:47:50 UTC (rev 4440) @@ -46,6 +46,7 @@ <li>DEC Áê¶ÌtHgÉPx/ºü®«ð½f·éæ¤Éµ½B</li> <li>Meta Key ÌÝèÅA¶AltâEAltÌÝMeta KeyÉÝèÅ«éæ¤Éµ½B</li> <li>NetTerm `®Ì}EXCxgÊmÉε½B</li> + <li>box n}NR}hÌ special øð³¹½B</li> </ul> </li> Modified: trunk/doc/ja/html/macro/command/inputbox.html =================================================================== --- trunk/doc/ja/html/macro/command/inputbox.html 2011-04-13 15:43:22 UTC (rev 4439) +++ trunk/doc/ja/html/macro/command/inputbox.html 2011-04-13 15:47:50 UTC (rev 4440) @@ -18,23 +18,56 @@ </p> <pre class="macro-syntax"> -inputbox <message> <title> [<default> [<special>(p~)]] +inputbox <message> <title> [<default> [<special>]] </pre> -<h2>ðà</h2> +<h2>p[^</h2> -<p> -¶ñ <message> Í_CAO{bNXÉ\¦³êébZ[WA¶ñ <title> Í_CAO{bNXÌ^CgBüͳ꽶ñÍVXeÏ inputstr Éãü³êéB -</p> +<dl> + <dt class="macro">¶ñ <message></dt> + <dd>_CAO{bNXÉ\¦³êébZ[WB</dd> + + <dt class="macro">¶ñ <title></dt> + <dd>_CAO{bNXÌ^CgB</dd> + + <dt class="macro">¶ñ <default> (IvV ftHg=""(ó¶ñ))</dt> + <dd>GfBbgRg[ÌftHg¶ñÅ·B</dd> + + <dt class="macro">®l <special> (IvV ftHg=1)</dt> + <dd>0 ÅÈ¢êÍA<message> ÉÜÜêéȺ̶ñÍÁê¶ÆµÄµíêÜ·B<br> + <special> ÌlÍ <default> ÉÍe¿ð^¦Ü¹ñB<br> + + <table border="2"> + <tr> + <th>üÍ</th> + <th>oÍ</th> + </tr> + <tr> + <td>\\</td> + <td>"\"</td> + </tr> + <tr> + <td>\n</td> + <td>üs</td> + </tr> + <tr> + <td>\t</td> + <td>^u</td> + </tr> + </table> + + </dd> -<p> -<default> ÍGfBbgRg[ÌftHg¶ñÅ·Bwè³êÈ¢êÍ ""(ó¶ñ) ªgp³êÜ·B -</p> +</dl> -<p> -<special> Íp~³êܵ½BG[ÉÍÈèܹñªA³øÅ·B -</p> +<h2>Ôèl</h2> +<dl> + <dt class="macro">VXeÏ <inputstr></dt> + <dd>üͳ꽶ñªãü³êéB</dd> + +</dl> + <h2>á</h2> <pre class="macro-example"> Modified: trunk/doc/ja/html/macro/command/messagebox.html =================================================================== --- trunk/doc/ja/html/macro/command/messagebox.html 2011-04-13 15:43:22 UTC (rev 4439) +++ trunk/doc/ja/html/macro/command/messagebox.html 2011-04-13 15:47:50 UTC (rev 4440) @@ -18,18 +18,43 @@ </p> <pre class="macro-syntax"> -messagebox <message> <title> [<special>(p~)] +messagebox <message> <title> [<special>] </pre> -<h2>ðà</h2> +<h2>p[^</h2> -<p> -¶ñ <message> Í_CAO{bNXÉ\¦³êébZ[WA¶ñ <title> Í_CAO{bNXÌ^Cgð\·B -</p> +<dl> + <dt class="macro">¶ñ <message></dt> + <dd>_CAO{bNXÉ\¦³êébZ[WB</dd> + + <dt class="macro">¶ñ <title></dt> + <dd>_CAO{bNXÌ^CgB</dd> + + <dt class="macro">®l <special> (IvV ftHg=1)</dt> + <dd>0 ÅÈ¢êÍA<message> ÉÜÜêéȺ̶ñÍÁê¶ÆµÄµíêÜ·B<br> + + <table border="2"> + <tr> + <th>üÍ</th> + <th>oÍ</th> + </tr> + <tr> + <td>\\</td> + <td>"\"</td> + </tr> + <tr> + <td>\n</td> + <td>üs</td> + </tr> + <tr> + <td>\t</td> + <td>^u</td> + </tr> + </table> + + </dd> -<p> -<special> Íp~³êܵ½BG[ÉÍÈèܹñªA³øÅ·B -</p> +</dl> <h2>á</h2> Modified: trunk/doc/ja/html/macro/command/passwordbox.html =================================================================== --- trunk/doc/ja/html/macro/command/passwordbox.html 2011-04-13 15:43:22 UTC (rev 4439) +++ trunk/doc/ja/html/macro/command/passwordbox.html 2011-04-13 15:47:50 UTC (rev 4440) @@ -18,22 +18,56 @@ </p> <pre class="macro-syntax"> -passwordbox <message> <title> [<special>(p~)] +passwordbox <message> <title> [<special>] </pre> -<h2>ðà</h2> +<h2>p[^</h2> -<p> -¶ñ <message> Í_CAO{bNXÉ\¦³êébZ[WA¶ñ <title> Í_CAO{bNXÌ^CgB -</p> +<dl> + <dt class="macro">¶ñ <message></dt> + <dd>_CAO{bNXÉ\¦³êébZ[WB</dd> + + <dt class="macro">¶ñ <title></dt> + <dd>_CAO{bNXÌ^CgB</dd> + + <dt class="macro">®l <special> (IvV ftHg=1)</dt> + <dd>0 ÅÈ¢êÍA<message> ÉÜÜêéȺ̶ñÍÁê¶ÆµÄµíêÜ·B<br> + + <table border="2"> + <tr> + <th>üÍ</th> + <th>oÍ</th> + </tr> + <tr> + <td>\\</td> + <td>"\"</td> + </tr> + <tr> + <td>\n</td> + <td>üs</td> + </tr> + <tr> + <td>\t</td> + <td>^u</td> + </tr> + </table> + + </dd> -<p> -üͳêépX[hÍ»ÌÜÜ\¦³ê¸A©íèÉA"****" Ìæ¤É\¦³êéB<br> -üͳê½pX[hÍVXeÏ inputstr Éãü³êéB -</p> +</dl> +<h2>Ôèl</h2> + +<dl> + <dt class="macro">VXeÏ <inputstr></dt> + <dd>üͳ꽶ñªãü³êéB</dd> + +</dl> + +<h2>ðà</h2> + <p> -<special> Íp~³êܵ½BG[ÉÍÈèܹñªA³øÅ·B +üͳêépX[hÍ»ÌÜÜ\¦³ê¸A©íèÉA"****" Ìæ¤É\¦³êéB </p> <h2>á</h2> Modified: trunk/doc/ja/html/macro/command/statusbox.html =================================================================== --- trunk/doc/ja/html/macro/command/statusbox.html 2011-04-13 15:43:22 UTC (rev 4439) +++ trunk/doc/ja/html/macro/command/statusbox.html 2011-04-13 15:47:50 UTC (rev 4440) @@ -18,25 +18,56 @@ </p> <pre class="macro-syntax"> -statusbox <message> <title> [<special>(p~)] +statusbox <message> <title> [<special>] </pre> +<h2>p[^</h2> + +<dl> + <dt class="macro">¶ñ <message></dt> + <dd>_CAO{bNXÉ\¦³êébZ[WB</dd> + + <dt class="macro">¶ñ <title></dt> + <dd>_CAO{bNXÌ^CgB</dd> + + <dt class="macro">®l <special> (IvV ftHg=1)</dt> + <dd>0 ÅÈ¢êÍA<message> ÉÜÜêéȺ̶ñÍÁê¶ÆµÄµíêÜ·B<br> + + <table border="2"> + <tr> + <th>üÍ</th> + <th>oÍ</th> + </tr> + <tr> + <td>\\</td> + <td>"\"</td> + </tr> + <tr> + <td>\n</td> + <td>üs</td> + </tr> + <tr> + <td>\t</td> + <td>^u</td> + </tr> + </table> + + </dd> + +</dl> + <h2>ðà</h2> <p> -Xe[^X_CAO{bNXª\¦³êĢȢêA»êð\¦·éB<br> -_CAO{bNXÌbZ[Wð <message> ÉA^Cgð <title> ÉϦéB +Xe[^X_CAO{bNXª\¦³êĢȢêA»êð\¦µÜ·B<br> +_CAO{bNXÌbZ[Wð <message> ÉA^Cgð <title> ÉϦܷB </p> <p> -"<a href="setdlgpos.html">setdlgpos</a>" R}hÍXe[^X_CAO{bNXÌÊuðϦéB<br> -"<a href="closesbox.html">closesbox</a>" R}hÍXe[^X_CAO{bNXð¶éBEnterL[âESCL[ÅͶé±ÆÍūܹñB +"<a href="setdlgpos.html">setdlgpos</a>" R}hÍXe[^X_CAO{bNXÌÊuðϦܷB<br> +"<a href="closesbox.html">closesbox</a>" R}hÍXe[^X_CAO{bNXð¶ܷBEnterL[âESCL[ÅͶé±ÆÍūܹñB </p> -<p> -<special> Íp~³êܵ½BG[ÉÍÈèܹñªA³øÅ·B -</p> - <h2>á</h2> <pre class="macro-example"> Modified: trunk/doc/ja/html/macro/command/yesnobox.html =================================================================== --- trunk/doc/ja/html/macro/command/yesnobox.html 2011-04-13 15:43:22 UTC (rev 4439) +++ trunk/doc/ja/html/macro/command/yesnobox.html 2011-04-13 15:47:50 UTC (rev 4440) @@ -18,23 +18,53 @@ </p> <pre class="macro-syntax"> -yesnobox <message> <title> [<special>(p~)] +yesnobox <message> <title> [<special>] </pre> -<h2>ðà</h2> +<h2>p[^</h2> -<p> -¶ñ <message> Í_CAO{bNXÉ\¦³êébZ[WA¶ñ <title> Í_CAO{bNXÌ^CgB -</p> +<dl> + <dt class="macro">¶ñ <message></dt> + <dd>_CAO{bNXÉ\¦³êébZ[WB</dd> + + <dt class="macro">¶ñ <title></dt> + <dd>_CAO{bNXÌ^CgB</dd> + + <dt class="macro">®l <special> (IvV ftHg=1)</dt> + <dd>0 ÅÈ¢êÍA<message> ÉÜÜêéȺ̶ñÍÁê¶ÆµÄµíêÜ·B<br> + + <table border="2"> + <tr> + <th>üÍ</th> + <th>oÍ</th> + </tr> + <tr> + <td>\\</td> + <td>"\"</td> + </tr> + <tr> + <td>\n</td> + <td>üs</td> + </tr> + <tr> + <td>\t</td> + <td>^u</td> + </tr> + </table> + + </dd> -<p> -uÍ¢v{^ª³ê½êAVXeÏ resultÉ1ªi[³êéBu¢¢¦v{^ª³ê½êAresult É0ªi[³êéB -</p> +</dl> -<p> -<special> Íp~³êܵ½BG[ÉÍÈèܹñªA³øÅ·B -</p> +<h2>Ôèl</h2> +<dl> + <dt class="macro">VXeÏ <result></dt> + <dd>uÍ¢v{^ª³ê½êA1ªi[³êéB<br> + u¢¢¦v{^ª³ê½êA0ªi[³êéB</dd> + +</dl> + <h2>á</h2> <pre class="macro-example"> Modified: trunk/teraterm/ttpmacro/ttl.c =================================================================== --- trunk/teraterm/ttpmacro/ttl.c 2011-04-13 15:43:22 UTC (rev 4439) +++ trunk/teraterm/ttpmacro/ttl.c 2011-04-13 15:47:50 UTC (rev 4440) @@ -2312,7 +2312,7 @@ { TStrVal Str1, Str2, Str3; WORD Err, ValType, VarId, P; - int sp; + int sp = 1; Err = 0; GetStrVal(Str1,&Err); @@ -2334,7 +2334,6 @@ } // get 4th(3rd) arg(optional) if given - // this parameter is not used. if (CheckParameterGiven()) { GetIntVal(&sp, &Err); } @@ -2343,6 +2342,10 @@ Err = ErrSyntax; if (Err!=0) return Err; + if (sp) { + RestoreNewLine(Str1); + } + SetInputStr(""); if (CheckVar("inputstr",&ValType,&VarId) && (ValType==TypString)) @@ -2566,7 +2569,7 @@ int MessageCommand(int BoxId, LPWORD Err) { TStrVal Str1, Str2; - int sp; + int sp = 1; int ret; *Err = 0; @@ -2575,7 +2578,6 @@ if (*Err!=0) return 0; // get 3rd arg(optional) if given - // this parameter is not used. if (CheckParameterGiven()) { GetIntVal(&sp, Err); } @@ -2584,6 +2586,10 @@ *Err = ErrSyntax; if (*Err!=0) return 0; + if (sp) { + RestoreNewLine(Str1); + } + if (BoxId==IdMsgBox) { ret = OpenMsgDlg(Str1,Str2,FALSE); // bZ[W{bNXðLZ·éÆA}NÌI¹Æ·éB