Changeset 11
- Timestamp:
- 05/09/06 22:21:53 (2 years ago)
- Location:
- trunk/txlib
- Files:
-
- 23 modified
-
include/txcon.h (modified) (16 diffs)
-
include/txlib.h (modified) (4 diffs)
-
include/txwin.h (modified) (4 diffs)
-
license.txt (modified) (1 diff)
-
txcon.c (modified) (15 diffs)
-
txcon3.c (modified) (2 diffs)
-
txextcmd.c (modified) (3 diffs)
-
txfpath.c (modified) (2 diffs)
-
txlib.c (modified) (1 diff)
-
txlogfil.c (modified) (1 diff)
-
txosver.c (modified) (1 diff)
-
txparse.c (modified) (2 diffs)
-
txparse2.c (modified) (1 diff)
-
txselist.c (modified) (1 diff)
-
txstdcmd.c (modified) (4 diffs)
-
txstrsiz.c (modified) (1 diff)
-
txvers.h (modified) (1 diff)
-
txwdraw.c (modified) (2 diffs)
-
txwhelp.c (modified) (2 diffs)
-
txwikey.c (modified) (8 diffs)
-
txwmsg.c (modified) (1 diff)
-
txwstdlg.c (modified) (5 diffs)
-
txwutil.c (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/txlib/include/txcon.h
r1 r11 74 74 75 75 76 typedef enum screen_state76 typedef enum device_state 77 77 { 78 SCREEN_ON = 0,79 SCREEN_OFF = 1,80 SCREEN_TEST = 281 } SCREEN_STATE; // end of enum "screen_state"78 DEVICE_ON = 0, 79 DEVICE_OFF = 1, 80 DEVICE_TEST = 2 81 } DEVICE_STATE; // end of enum "device_state" 82 82 83 83 // void void function pointer … … 808 808 if (TxTrLevel >= 10) \ 809 809 { \ 810 SCREEN_STATE tss = TxScreenState(SCREEN_TEST); \811 if (TxTrLogOnly) TxScreenState( SCREEN_OFF); \810 DEVICE_STATE tss = TxScreenState(DEVICE_TEST); \ 811 if (TxTrLogOnly) TxScreenState(DEVICE_OFF); \ 812 812 TxTraceEnter( __FUNCTION__); \ 813 813 TxTraceLeader(); \ … … 825 825 if (TxTrLevel >= 10) \ 826 826 { \ 827 SCREEN_STATE tss = TxScreenState(SCREEN_TEST); \828 if (TxTrLogOnly) TxScreenState( SCREEN_OFF); \827 DEVICE_STATE tss = TxScreenState(DEVICE_TEST); \ 828 if (TxTrLogOnly) TxScreenState(DEVICE_OFF); \ 829 829 TxTraceReturn( __FUNCTION__, (ULONG) retc); \ 830 830 if (TxTrLogOnly) TxScreenState(tss); \ … … 837 837 if (TxTrLevel >= 10) \ 838 838 { \ 839 SCREEN_STATE tss = TxScreenState(SCREEN_TEST); \840 if (TxTrLogOnly) TxScreenState( SCREEN_OFF); \839 DEVICE_STATE tss = TxScreenState(DEVICE_TEST); \ 840 if (TxTrLogOnly) TxScreenState(DEVICE_OFF); \ 841 841 TxTraceEnter( __FUNCTION__); \ 842 842 if (TxTrLogOnly) TxScreenState(tss); \ … … 851 851 if (TxTrLevel >= 10) \ 852 852 { \ 853 SCREEN_STATE tss = TxScreenState(SCREEN_TEST); \854 if (TxTrLogOnly) TxScreenState( SCREEN_OFF); \853 DEVICE_STATE tss = TxScreenState(DEVICE_TEST); \ 854 if (TxTrLogOnly) TxScreenState(DEVICE_OFF); \ 855 855 TxTraceRetVoid( __FUNCTION__); \ 856 856 if (TxTrLogOnly) TxScreenState(tss); \ … … 861 861 if (TxTrLevel >= 10) \ 862 862 { \ 863 SCREEN_STATE tss = TxScreenState(SCREEN_TEST); \864 if (TxTrLogOnly) TxScreenState( SCREEN_OFF); \863 DEVICE_STATE tss = TxScreenState(DEVICE_TEST); \ 864 if (TxTrLogOnly) TxScreenState(DEVICE_OFF); \ 865 865 TxTraceRetDouble( __FUNCTION__, (double) rc); \ 866 866 if (TxTrLogOnly) TxScreenState(tss); \ … … 871 871 if (TxTrLevel >= 10) \ 872 872 { \ 873 SCREEN_STATE tss = TxScreenState(SCREEN_TEST); \874 if (TxTrLogOnly) TxScreenState( SCREEN_OFF); \873 DEVICE_STATE tss = TxScreenState(DEVICE_TEST); \ 874 if (TxTrLogOnly) TxScreenState(DEVICE_OFF); \ 875 875 TxTraceRetBool( __FUNCTION__, (BOOL) rc); \ 876 876 if (TxTrLogOnly) TxScreenState(tss); \ … … 881 881 if (TxTrLevel >= 10) \ 882 882 { \ 883 SCREEN_STATE tss = TxScreenState(SCREEN_TEST); \884 if (TxTrLogOnly) TxScreenState( SCREEN_OFF); \883 DEVICE_STATE tss = TxScreenState(DEVICE_TEST); \ 884 if (TxTrLogOnly) TxScreenState(DEVICE_OFF); \ 885 885 TxTraceReturn( __FUNCTION__, (ULONG) rc); \ 886 886 if (TxTrLogOnly) TxScreenState(tss); \ … … 893 893 if (TxTrLevel >= lev) \ 894 894 { \ 895 SCREEN_STATE tss = TxScreenState(SCREEN_TEST); \896 if (TxTrLogOnly) TxScreenState( SCREEN_OFF); \895 DEVICE_STATE tss = TxScreenState(DEVICE_TEST); \ 896 if (TxTrLogOnly) TxScreenState(DEVICE_OFF); \ 897 897 TxTraceLeader(); \ 898 898 TxPrint txf; \ … … 917 917 if (TxTrLevel >= lev) \ 918 918 { \ 919 SCREEN_STATE tss = TxScreenState(SCREEN_TEST); \920 if (TxTrLogOnly) TxScreenState( SCREEN_OFF); \919 DEVICE_STATE tss = TxScreenState(DEVICE_TEST); \ 920 if (TxTrLogOnly) TxScreenState(DEVICE_OFF); \ 921 921 TxPrint( "Hexdump at %8.8lx size:% 3lu bytes, of '%s'\n", \ 922 922 (char *) a, (ULONG) b, s); \ … … 932 932 if (TxTrLevel >= 30) \ 933 933 { \ 934 SCREEN_STATE tss = TxScreenState(SCREEN_TEST); \935 if (TxTrLogOnly) TxScreenState( SCREEN_OFF); \934 DEVICE_STATE tss = TxScreenState(DEVICE_TEST); \ 935 if (TxTrLogOnly) TxScreenState(DEVICE_OFF); \ 936 936 TxPrint("%s Data *: %8.8lX, size: % 9lu " \ 937 937 "= %8.8lX, CRC: %s%8.8lX%s\n", \ … … 948 948 if (TxTrLevel >= lev) \ 949 949 { \ 950 SCREEN_STATE tss = TxScreenState(SCREEN_TEST); \951 if (TxTrLogOnly) TxScreenState( SCREEN_OFF); \950 DEVICE_STATE tss = TxScreenState(DEVICE_TEST); \ 951 if (TxTrLogOnly) TxScreenState(DEVICE_OFF); \ 952 952 TxDisplayHex(l, (char *)a, (ULONG) b, (ULONG) o); \ 953 953 if (TxTrLogOnly) TxScreenState(tss); \ … … 959 959 if (TxTrLevel >= lev) \ 960 960 { \ 961 SCREEN_STATE tss = TxScreenState(SCREEN_TEST); \962 if (TxTrLogOnly) TxScreenState( SCREEN_OFF); \961 DEVICE_STATE tss = TxScreenState(DEVICE_TEST); \ 962 if (TxTrLogOnly) TxScreenState(DEVICE_OFF); \ 963 963 TxTraceLeader() 964 964 … … 977 977 if ((TxTrLevel >= 10) && (!TxTrLogOnly)) \ 978 978 { \ 979 SCREEN_STATE tss = TxScreenState(SCREEN_TEST); \980 if (TxTrLogOnly) TxScreenState( SCREEN_OFF); \979 DEVICE_STATE tss = TxScreenState(DEVICE_TEST); \ 980 if (TxTrLogOnly) TxScreenState(DEVICE_OFF); \ 981 981 TxPrint("\n"); \ 982 982 if (TxTrLogOnly) TxScreenState(tss); \ … … 997 997 if (TxTrLevel >= 70) \ 998 998 { \ 999 SCREEN_STATE tss = TxScreenState(SCREEN_TEST); \1000 if (TxTrLogOnly) TxScreenState( SCREEN_OFF); \999 DEVICE_STATE tss = TxScreenState(DEVICE_TEST); \ 1000 if (TxTrLogOnly) TxScreenState(DEVICE_OFF); \ 1001 1001 TxPrint txf; \ 1002 1002 if (TxTrLogOnly) TxScreenState(tss); \ … … 1223 1223 1224 1224 // Test and set TxScreenState 1225 SCREEN_STATE TxScreenState // RET screen active 1226 ( 1227 SCREEN_STATE action // IN screen action 1225 DEVICE_STATE TxScreenState // RET screen active 1226 ( 1227 DEVICE_STATE action // IN screen action 1228 ); 1229 1230 1231 // Test and set TxLogfileState, logging when state = ON and file opened 1232 DEVICE_STATE TxLogfileState // RET logfile active 1233 ( 1234 DEVICE_STATE action // IN logfile action 1228 1235 ); 1229 1236 -
trunk/txlib/include/txlib.h
r10 r11 1048 1048 #define TXA_O_LIST 139 // predefined 'list' 1049 1049 #define TXA_O_SCREEN 140 // predefined 'screen' 1050 #define TXA_O_TEST1 141 1051 #define TXA_O_TEST2 142 1052 #define TXA_O_TEST3 143 // predefined 'test1' .. 5 1053 #define TXA_O_TEST4 144 1054 #define TXA_O_TEST5 145 1055 #define TXA_O_APP0 146 1056 #define TXA_O_APP1 147 // application defined 1057 #define TXA_O_APP2 148 // options/switches 1058 #define TXA_O_APP3 149 1059 #define TXA_O_APP4 150 1060 #define TXA_O_APP5 151 1061 1062 #define TXA_LSIZE 29 // number of long options 1063 #define TXA_SIZE 120 // total number of options 1050 #define TXA_O_LABEL 141 // predefined 'label' 1051 #define TXA_O_TEST1 142 1052 #define TXA_O_TEST2 143 1053 #define TXA_O_TEST3 144 // predefined 'test1' .. 5 1054 #define TXA_O_TEST4 145 1055 #define TXA_O_TEST5 146 1056 #define TXA_O_APP0 147 1057 #define TXA_O_APP1 148 // application defined 1058 #define TXA_O_APP2 149 // options/switches 1059 #define TXA_O_APP3 150 1060 #define TXA_O_APP4 151 1061 #define TXA_O_APP5 152 1062 1063 #define TXA_LSIZE 30 // number of long options 1064 #define TXA_SIZE 121 // total number of options 1064 1065 1065 1066 #define TXA_O_LEN 31 // maximum length long name … … 1343 1344 1344 1345 //- definitions for flags that apply to the whole list (list->flags) 1346 1345 1347 #define TXSL_MULTI_QUICK 0x00000001 // use itemtext for quickselect 1346 1348 // not just the item-index char 1349 // (used in directory listing) 1350 1351 #define TXSL_ITEM_DELETE 0x00000010 // allow item delete (Ctrl-D) 1352 // del from list, send Ctrl-D 1353 // to the owner as well ... 1347 1354 1348 1355 //- definitions for Alloc-Status of selist objects (Static/Shared or Dynamic) … … 1548 1555 ); 1549 1556 1557 // Delete current item from the list (like Ctrl-D on a history :-) 1558 ULONG TxSelDeleteCurrent // RET resulting selected 1559 ( 1560 TXSELIST *list // INOUT selection list 1561 ); 1562 1550 1563 // Create static selist from existing Txt list 1551 1564 ULONG TxSelistFromTxt // RET result … … 1751 1764 char *text, // IN leading string 1752 1765 LLONG data, // IN size data 1766 char *trail // IN trailing text 1767 ); 1768 1769 // Format time in seconds in an HHH:MM:SS string (Elapsed/ETA) 1770 char *txStrSec2hms // RET resulting string 1771 ( 1772 char *str, // OUT resulting string 1773 char *text, // IN leading string 1774 ULONG sec, // IN seconds 1753 1775 char *trail // IN trailing text 1754 1776 ); -
trunk/txlib/include/txwin.h
r9 r11 1341 1341 if (TxTrLevel >= 70) \ 1342 1342 { \ 1343 SCREEN_STATE tss = TxScreenState(SCREEN_TEST); \1344 if (TxTrLogOnly) TxScreenState( SCREEN_OFF); \1343 DEVICE_STATE tss = TxScreenState(DEVICE_TEST); \ 1344 if (TxTrLogOnly) TxScreenState(DEVICE_OFF); \ 1345 1345 txwWbsDescription(txt,wbs); \ 1346 1346 if (TxTrLogOnly) TxScreenState(tss); \ … … 1352 1352 if (TxTrLevel >= 70) \ 1353 1353 { \ 1354 SCREEN_STATE tss = TxScreenState(SCREEN_TEST); \1355 if (TxTrLogOnly) TxScreenState( SCREEN_OFF); \1354 DEVICE_STATE tss = TxScreenState(DEVICE_TEST); \ 1355 if (TxTrLogOnly) TxScreenState(DEVICE_OFF); \ 1356 1356 txwDumpWindows(txt); \ 1357 1357 if (TxTrLogOnly) TxScreenState(tss); \ … … 2162 2162 ); 2163 2163 2164 #define txwAllowUserStatusMessages(on) txwDefaultStatusShow( !(on)); 2165 2164 2166 // Set display of default-status in sbview ON or OFF (Ctrl+arrows ...") 2165 2167 void txwDefaultStatusShow … … 2178 2180 #define txwSetSbviewStatus(a,b) 2179 2181 #define txwSetDesktopTopLine(a,b) 2182 #define txwAllowUserStatusMessages(on) 2180 2183 #endif // USEWINDOWING 2181 2184 -
trunk/txlib/license.txt
r1 r11 2 2 TxWin, Textmode Windowing Library 3 3 4 Original code Copyright (c) 1995-200 5Fsys Software and Jan van Wijk4 Original code Copyright (c) 1995-2006 Fsys Software and Jan van Wijk 5 5 6 6 ========================================================================== -
trunk/txlib/txcon.c
r7 r11 53 53 #include <txtpriv.h> // private text interface 54 54 55 static SCREEN_STATE screen_act = SCREEN_ON; 55 static DEVICE_STATE screen_act = DEVICE_ON; 56 static DEVICE_STATE logfile_act = DEVICE_ON; 56 57 57 58 #if defined (USEWINDOWING) … … 427 428 // Test and set TxScreenState 428 429 /*****************************************************************************/ 429 SCREEN_STATE TxScreenState // RET screen active430 ( 431 SCREEN_STATE action // IN screen action432 ) 433 { 434 if (action != SCREEN_TEST)430 DEVICE_STATE TxScreenState // RET screen active 431 ( 432 DEVICE_STATE action // IN screen action 433 ) 434 { 435 if (action != DEVICE_TEST) 435 436 { 436 437 screen_act = action; … … 438 439 return (screen_act); 439 440 } // end 'TxScreenState' 441 /*---------------------------------------------------------------------------*/ 442 443 444 /*****************************************************************************/ 445 // Test and set TxLogfileState, logging when state = ON and file opened 446 /*****************************************************************************/ 447 DEVICE_STATE TxLogfileState // RET logfile active 448 ( 449 DEVICE_STATE action // IN screen action 450 ) 451 { 452 if (action != DEVICE_TEST) 453 { 454 logfile_act = action; 455 } 456 return (logfile_act); 457 } // end 'TxLogfileState' 440 458 /*---------------------------------------------------------------------------*/ 441 459 … … 471 489 } 472 490 473 if ((screen_act == SCREEN_ON) && // screen output ON491 if ((screen_act == DEVICE_ON) && // screen output ON 474 492 (txh_raw == NULL)) // and not redirected to a RAW 475 493 { // stream (like scrollbuffer) … … 484 502 { 485 503 if ((size < hinfo->size) && (hinfo->active) && 486 ((screen_act == SCREEN_ON) ||504 ((screen_act == DEVICE_ON) || 487 505 (hinfo->follow_screen_toggle == FALSE))) 488 506 { … … 497 515 { 498 516 if ((size < hinfo->size) && (hinfo->active) && 499 ((screen_act == SCREEN_ON) ||517 ((screen_act == DEVICE_ON) || 500 518 (hinfo->follow_screen_toggle == FALSE))) 501 519 { … … 504 522 } 505 523 } 506 if ( log_handle != 0)524 if ((log_handle != 0) && (logfile_act == DEVICE_ON)) 507 525 { 508 526 if (!txc_ascii7 && log7bit) // 7-bit ASCII for log only ? … … 695 713 int ll; // real max line length 696 714 int lines; // nr of lines 697 SCREEN_STATE sa = screen_act;715 DEVICE_STATE sa = screen_act; 698 716 699 717 if ((ll = TxScreenCols() -12) < 20) // ScreenCols will be 0 if … … 703 721 if ((txwa->desktop != NULL) && (!TxaExeSwitch('p'))) 704 722 { 705 screen_act = SCREEN_OFF; // no regular text if windowed723 screen_act = DEVICE_OFF; // no regular text if windowed 706 724 } // and not 'pedantic mode' 707 725 else 708 726 { 709 screen_act = SCREEN_ON; // force screen for confirm727 screen_act = DEVICE_ON; // force screen for confirm 710 728 } 711 729 va_start(varargs, fmt); … … 717 735 txFreeText( mText); // free the text memory 718 736 737 screen_act = sa; // restore screen state 738 // to allow sbView output while 739 // MsgBox is up (other threads!) 719 740 #if defined (USEWINDOWING) 720 741 if (txwa->desktop != NULL) // there is a desktop … … 774 795 TxPrint("%c\n", reply); 775 796 776 screen_act = sa; // restore screen state777 797 return (cf); 778 798 } // end 'TxConfirm' … … 797 817 int ll; // real max line length 798 818 int lines; // nr of lines 799 SCREEN_STATE sa = screen_act;819 DEVICE_STATE sa = screen_act; 800 820 801 821 if ((ll = TxScreenCols() -4) < 20) // ScreenCols will be 0 if … … 805 825 if ((txwa->desktop != NULL) && (acknowledge) && (!TxaExeSwitch('p'))) 806 826 { 807 screen_act = SCREEN_OFF; // no regular text if windowed827 screen_act = DEVICE_OFF; // no regular text if windowed 808 828 } // and not 'pedantic mode' 809 829 else if (acknowledge) 810 830 { 811 screen_act = SCREEN_ON; // force screen on for confirm831 screen_act = DEVICE_ON; // force screen on for confirm 812 832 } 813 833 va_start(varargs, fmt); … … 820 840 TxPrint("\n"); 821 841 842 screen_act = sa; // restore screen state 843 // to allow sbView output while 844 // MsgBox is up (other threads!) 822 845 if (acknowledge) 823 846 { … … 845 868 } 846 869 } 847 screen_act = sa; // restore screen state848 870 return (rc); 849 871 } // end 'TxMessage' -
trunk/txlib/txcon3.c
r1 r11 62 62 int ll; // real max line length 63 63 int lines; // nr of lines 64 SCREEN_STATE sa = TxScreenState(SCREEN_TEST);64 DEVICE_STATE sa = TxScreenState(DEVICE_TEST); 65 65 66 66 if ((ll = TxScreenCols() -12) < 20) // ScreenCols will be 0 if … … 70 70 if ((txwa->desktop != NULL) && (!TxaExeSwitch('p'))) 71 71 { 72 TxScreenState( SCREEN_OFF); // no regular text if windowed72 TxScreenState(DEVICE_OFF); // no regular text if windowed 73 73 } &n