[Ttssh2-commit] [4397] ・IgnorePrinterCtrl - > PrinterCtrlSequence

svnno****@sourc***** svnno****@sourc*****
2011年 3月 28日 (月) 11:17:35 JST


Revision: 4397
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4397
Author:   doda
Date:     2011-03-28 11:17:34 +0900 (Mon, 28 Mar 2011)

Log Message:
-----------
・IgnorePrinterCtrl -> PrinterCtrlSequence
・DECMC も対象に追加
・パラメータの値毎に無視するかを判断するように変更

Modified Paths:
--------------
    trunk/installer/release/TERATERM.INI
    trunk/teraterm/common/tttypes.h
    trunk/teraterm/teraterm/vtterm.c
    trunk/teraterm/ttpset/ttset.c


-------------- next part --------------
Modified: trunk/installer/release/TERATERM.INI
===================================================================
--- trunk/installer/release/TERATERM.INI	2011-03-27 10:53:49 UTC (rev 4396)
+++ trunk/installer/release/TERATERM.INI	2011-03-28 02:17:34 UTC (rev 4397)
@@ -450,12 +450,12 @@
 ; Direct pass-thru printing
 PassThruPort=
 
-; Ignore printer control sequence(MC)
-IgnorePrinterCtrl=off
-
 ; Delay for paste per each lines (in msec)
 PasteDelayPerLine=10
 
+; Allow the sequences related to printer control
+PrinterCtrlSequence=on
+
 ; Printer font
 PrnFont=
 

Modified: trunk/teraterm/common/tttypes.h
===================================================================
--- trunk/teraterm/common/tttypes.h	2011-03-27 10:53:49 UTC (rev 4396)
+++ trunk/teraterm/common/tttypes.h	2011-03-28 02:17:34 UTC (rev 4397)
@@ -191,6 +191,7 @@
 #define TF_ALTSCR             512
 #define TF_LOCKTUID           1024
 #define TF_INVALIDDECRPSS     2048
+#define TF_PRINTERCTRL        4096
 
 // ANSI/Attribute color flags (used in ts.ColorFlag)
 #define CF_PCBOLD16     1
@@ -506,7 +507,6 @@
 	WORD DisableMenuNewConnection;
 	char TerminalUID[9];
 	WORD ConfirmChangePasteCR;
-	BOOL IgnorePrinterCtrl; 
 };
 
 typedef struct tttset TTTSet, *PTTSet;

Modified: trunk/teraterm/teraterm/vtterm.c
===================================================================
--- trunk/teraterm/teraterm/vtterm.c	2011-03-27 10:53:49 UTC (rev 4396)
+++ trunk/teraterm/teraterm/vtterm.c	2011-03-28 02:17:34 UTC (rev 4397)
@@ -1724,29 +1724,26 @@
 
   void CS_i_Mode()		// MC
   {
-	  /* ƒvƒŠƒ“ƒ^§ŒäƒR[ƒh‚ª—ˆ‚Ä‚à–³Ž‹‚·‚éB
-	   * ƒ‰ƒ“ƒjƒ“ƒOŽŽŒ±’†AƒzƒXƒg‚©‚çƒvƒŠƒ“ƒ^§ŒäƒR[ƒh‚ª“Í‚­‚ƁAˆóüƒ_ƒCƒAƒƒO‚ª
-	   * •\Ž¦‚³‚êATera Term‚ªˆêŽž’âŽ~‚µAŽŽŒ±‚ªŽ~‚Ü‚ç‚È‚¢‚悤‚É‚µ‚½‚¢B
-	   * (2011.3.25 yutaka)
-	   */
-	  if (ts.IgnorePrinterCtrl)
-		  return;
-
-
     if (Param[1]==-1) Param[1] = 0;
     switch (Param[1]) {
       /* print screen */
 	//  PrintEX --	TRUE: print screen
 	//		FALSE: scroll region
-      case 0: BuffPrint(! PrintEX); break;
+      case 0:
+	if (ts.TermFlag&TF_PRINTERCTRL) {
+	  BuffPrint(! PrintEX);
+	}
+	break;
       /* printer controller mode off */
       case 4: break; /* See PrnParseCS() */
       /* printer controller mode on */
       case 5:
-	if (! AutoPrintMode)
-	  OpenPrnFile();
-	DirectPrn = (ts.PrnDev[0]!=0);
-	PrinterMode = TRUE;
+	if (ts.TermFlag&TF_PRINTERCTRL) {
+	  if (! AutoPrintMode)
+	    OpenPrnFile();
+	  DirectPrn = (ts.PrnDev[0]!=0);
+	  PrinterMode = TRUE;
+	}
 	break;
     }
   }
@@ -2420,10 +2417,12 @@
       if (Param[1]==-1) Param[1] = 0;
       switch (Param[1]) {
 	case 1:
-	  OpenPrnFile();
-	  BuffDumpCurrentLine(LF);
-	  if (! AutoPrintMode)
-	    ClosePrnFile();
+	  if (ts.TermFlag&TF_PRINTERCTRL) {
+	    OpenPrnFile();
+	    BuffDumpCurrentLine(LF);
+	    if (! AutoPrintMode)
+	      ClosePrnFile();
+	  }
 	  break;
 	/* auto print mode off */
 	case 4:
@@ -2435,10 +2434,12 @@
 	  break;
 	/* auto print mode on */
 	case 5:
-	  if (! AutoPrintMode)
-	  {
-	    OpenPrnFile();
-	    AutoPrintMode = TRUE;
+	  if (ts.TermFlag&TF_PRINTERCTRL) {
+	    if (! AutoPrintMode)
+	    {
+	      OpenPrnFile();
+	      AutoPrintMode = TRUE;
+	    }
 	  }
 	  break;
       }

Modified: trunk/teraterm/ttpset/ttset.c
===================================================================
--- trunk/teraterm/ttpset/ttset.c	2011-03-27 10:53:49 UTC (rev 4396)
+++ trunk/teraterm/ttpset/ttset.c	2011-03-28 02:17:34 UTC (rev 4397)
@@ -922,8 +922,9 @@
 	GetPrivateProfileString(Section, "PassThruPort", "",
 	                        ts->PrnDev, sizeof(ts->PrnDev), FName);
 
-	/* ƒvƒŠƒ“ƒ^—p§ŒäƒR[ƒh‚𖳎‹‚·‚é‚©‚Ç‚¤‚© */
-	ts->IgnorePrinterCtrl = GetOnOff(Section, "IgnorePrinterCtrl", FName, FALSE);
+	/* ƒvƒŠƒ“ƒ^—p§ŒäƒR[ƒh‚ðŽó‚¯•t‚¯‚é‚© */
+	if (GetOnOff(Section, "PrinterCtrlSequence", FName, TRUE))
+		ts->TermFlag |= TF_PRINTERCTRL;
 
 	/* Printer Font --- special option */
 	GetPrivateProfileString(Section, "PrnFont", "",
@@ -2108,8 +2109,9 @@
 	/*   -- special option */
 	WritePrivateProfileString(Section, "PassThruPort", ts->PrnDev, FName);
 
-	/* ƒvƒŠƒ“ƒ^—p§ŒäƒR[ƒh‚𖳎‹‚·‚é‚©‚Ç‚¤‚© */
-	WriteOnOff(Section, "IgnorePrinterCtrl", FName, ts->IgnorePrinterCtrl);
+	/* ƒvƒŠƒ“ƒ^—p§ŒäƒR[ƒh‚ðŽó‚¯•t‚¯‚é‚© */
+	WriteOnOff(Section, "PrinterCtrlSequence", FName,
+		ts->TermFlag & TF_PRINTERCTRL);
 
 	/* Printer Font --- special option */
 	WriteFont(Section, "PrnFont", FName,



Ttssh2-commit メーリングリストの案内