Changeset 11 for trunk/txlib/txcon.c

Timestamp:

05/09/06 22:21:53 (3 years ago)

Author:

jvw

Message:

DFSee 8.01 level; fix crash on huge PATH; History-popup improved (4OS2 compatible)

Files:

• trunk/txlib/txcon.c (modified) (15 diffs)

trunk/txlib/txcon.c

@@ -53 +53 @@
 #include <txtpriv.h>                            // private text   interface
 
-static  SCREEN_STATE   screen_act  = SCREEN_ON;
+static  DEVICE_STATE   screen_act  = DEVICE_ON;
+static  DEVICE_STATE   logfile_act = DEVICE_ON;
 
 #if defined (USEWINDOWING)
@@ -427 +428 @@
 // Test and set TxScreenState
 /*****************************************************************************/
-SCREEN_STATE TxScreenState                      // RET   screen active
-(
-   SCREEN_STATE        action                   // IN    screen action
-)
-{
-   if (action != SCREEN_TEST)
+DEVICE_STATE TxScreenState                      // RET   screen active
+(
+   DEVICE_STATE        action                   // IN    screen action
+)
+{
+   if (action != DEVICE_TEST)
    {
       screen_act = action;
@@ -438 +439 @@
    return (screen_act);
 }                                               // end 'TxScreenState'
+/*---------------------------------------------------------------------------*/
+
+
+/*****************************************************************************/
+// Test and set TxLogfileState, logging when state = ON and file opened
+/*****************************************************************************/
+DEVICE_STATE TxLogfileState                     // RET   logfile active
+(
+   DEVICE_STATE        action                   // IN    screen action
+)
+{
+   if (action != DEVICE_TEST)
+   {
+      logfile_act = action;
+   }
+   return (logfile_act);
+}                                               // end 'TxLogfileState'
 /*---------------------------------------------------------------------------*/
 
@@ -471 +489 @@
       }
 
-      if ((screen_act    == SCREEN_ON) &&       // screen output ON
+      if ((screen_act    == DEVICE_ON) &&       // screen output ON
           (txh_raw       == NULL))              // and not redirected to a RAW
       {                                         // stream (like scrollbuffer)
@@ -484 +502 @@
       {
          if ((size < hinfo->size) && (hinfo->active) &&
-             ((screen_act == SCREEN_ON) ||
+             ((screen_act == DEVICE_ON) ||
               (hinfo->follow_screen_toggle == FALSE)))
          {
@@ -497 +515 @@
          {
             if ((size < hinfo->size) && (hinfo->active) &&
-                ((screen_act == SCREEN_ON) ||
+                ((screen_act == DEVICE_ON) ||
                  (hinfo->follow_screen_toggle == FALSE)))
             {
@@ -504 +522 @@
             }
          }
-         if (log_handle != 0)
+         if ((log_handle != 0) && (logfile_act == DEVICE_ON))
          {
             if (!txc_ascii7 && log7bit)         // 7-bit ASCII for log only ?
@@ -695 +713 @@
    int                 ll;                      // real max line length
    int                 lines;                   // nr of lines
-   SCREEN_STATE        sa = screen_act;
+   DEVICE_STATE        sa = screen_act;
 
    if ((ll = TxScreenCols() -12) < 20)          // ScreenCols will be 0 if
@@ -703 +721 @@
    if ((txwa->desktop != NULL) && (!TxaExeSwitch('p')))
    {
-      screen_act = SCREEN_OFF;                  // no regular text if windowed
+      screen_act = DEVICE_OFF;                  // no regular text if windowed
    }                                            // and not 'pedantic mode'
    else
    {
-      screen_act = SCREEN_ON;                   // force screen for confirm
+      screen_act = DEVICE_ON;                   // force screen for confirm
    }
    va_start(varargs, fmt);
@@ -717 +735 @@
    txFreeText( mText);                          // free the text memory
 
+   screen_act = sa;                             // restore screen state
+                                                // to allow sbView output while
+                                                // MsgBox is up (other threads!)
    #if defined (USEWINDOWING)
    if (txwa->desktop != NULL)                   // there is a desktop
@@ -774 +795 @@
    TxPrint("%c\n", reply);
 
-   screen_act = sa;                             // restore screen state
    return (cf);
 }                                               // end 'TxConfirm'
@@ -797 +817 @@
    int                 ll;                      // real max line length
    int                 lines;                   // nr of lines
-   SCREEN_STATE        sa = screen_act;
+   DEVICE_STATE        sa = screen_act;
 
    if ((ll = TxScreenCols() -4) < 20)           // ScreenCols will be 0 if
@@ -805 +825 @@
    if ((txwa->desktop != NULL) && (acknowledge) && (!TxaExeSwitch('p')))
    {
-      screen_act = SCREEN_OFF;                  // no regular text if windowed
+      screen_act = DEVICE_OFF;                  // no regular text if windowed
    }                                            // and not 'pedantic mode'
    else if (acknowledge)
    {
-      screen_act = SCREEN_ON;                   // force screen on for confirm
+      screen_act = DEVICE_ON;                   // force screen on for confirm
    }
    va_start(varargs, fmt);
@@ -820 +840 @@
    TxPrint("\n");
 
+   screen_act = sa;                             // restore screen state
+                                                // to allow sbView output while
+                                                // MsgBox is up (other threads!)
    if (acknowledge)
    {
@@ -845 +868 @@
       }
    }
-   screen_act = sa;                             // restore screen state
    return (rc);
 }                                               // end 'TxMessage'