Changeset 14

Timestamp:

07/08/06 18:42:16 (2 years ago)

Author:

jvw

Message:

HEX/ASCII (sector) editor control added

Files:

• trunk/sam2/sam2.c (modified) (1 diff)
• trunk/sam3/sam3.c (modified) (1 diff)
• trunk/sam4/sam4.c (modified) (1 diff)
• trunk/sam5/sam5.c (modified) (1 diff)
• trunk/sam6/sam6.c (modified) (1 diff)
• trunk/sam7/sam7.c (modified) (1 diff)
• trunk/txlib/include/txcon.h (modified) (4 diffs)
• trunk/txlib/include/txlib.h (modified) (1 diff)
• trunk/txlib/include/txwin.h (modified) (14 diffs)
• trunk/txlib/makefile.mif (modified) (1 diff)
• trunk/txlib/txcon.c (modified) (7 diffs)
• trunk/txlib/txlogfil.c (modified) (2 diffs)
• trunk/txlib/txparse.c (modified) (2 diffs)
• trunk/txlib/txstdcmd.c (modified) (2 diffs)
• trunk/txlib/txvers.h (modified) (1 diff)
• trunk/txlib/txwdraw.c (modified) (25 diffs)
• trunk/txlib/txwdraw.h (modified) (4 diffs)
• trunk/txlib/txwhelp.c (modified) (1 diff)
• trunk/txlib/txwind.c (modified) (1 diff)
• trunk/txlib/txwpriv.h (modified) (1 diff)
• trunk/txlib/txwproc.c (modified) (6 diffs)
• trunk/txlib/txwstdlg.c (modified) (2 diffs)
• trunk/txlib/txwutil.c (modified) (1 diff)

trunk/sam2/sam2.c

@@ -53 +53 @@
-   if (TxaExeSwitch('l'))                       // start logfile now ?
-   {
-
+, TRUE
-   }
-   if ((TxaExeSwitch('?')) ||                   // switch help requested

trunk/sam3/sam3.c

@@ -54 +54 @@
-   if (TxaExeSwitch('l'))                       // start logfile now ?
-   {
-
+, TRUE
-   }
-   if ((TxaExeSwitch('?')) ||                   // switch help requested

trunk/sam4/sam4.c

@@ -84 +84 @@
-   if (TxaExeSwitch('l'))                       // start logfile now ?
-   {
-
+, TRUE
-   }
-   if ((TxaExeSwitch('?')) ||                   // switch help requested

trunk/sam5/sam5.c

@@ -72 +72 @@
-   if (TxaExeSwitch('l'))                       // start logfile now ?
-   {
-
+, TRUE
-   }
-   if ((TxaExeSwitch('?')) ||                   // switch help requested

trunk/sam6/sam6.c

@@ -93 +93 @@
-   if (TxaExeSwitch('l'))                       // start logfile now ?
-   {
-
+, TRUE
-   }
-   if (TxaExeSwitch('?'))                       // switch help requested

trunk/sam7/sam7.c

@@ -184 +184 @@
-   if (TxaExeSwitch('l'))                       // start logfile now ?
-   {
-
+, TRUE
-   }
-   if (TxaExeSwitch('?'))                       // switch help requested

trunk/txlib/include/txcon.h

@@ -781 +781 @@
-#undef  TRCRCD
-#undef  TRDUMP
+#undef  TRHEAP
-#undef  TRINIT
-#undef  TREXIT
@@ -956 +957 @@
-
-
+#define TRHEAP(lev)                                                           \
+                 {                                                            \
+                    if (TxTrLevel >= lev)                                     \
+                    {                                                         \
+                       switch (_heapchk())                                    \
+                       {                                                      \
+                          case _HEAPOK:                                       \
+                          case _HEAPEMPTY:                                    \
+                             TRLEVX(lev,( "Heap is still OK\n"));             \
+                             break;                                           \
+                                                                              \
+                          default:                                            \
+                             TRLEVX(lev,( "Heap corruption!\n"));             \
+                             break;                                           \
+                       }                                                      \
+                    }                                                         \
+                 }
+
+
-#define TRINIT(lev)                                                           \
-                    if (TxTrLevel >= lev)                                     \
@@ -1051 +1071 @@
-#define TRCRCD(l,a,b,d)
-#define TRDUMP(lev,l,a,b,o)
+#define TRHEAP(lev)
-#define TRINIT(lev) if (TxTrLevel >= lev)                                     \
-                    {
@@ -1219 +1240 @@
-(
-   ULONG               seq,                     // IN    sequence number
+   ULONG               retain,                  // IN    nr of files kept
-   TXLN                buf                      // IN    filename buffer
-);

trunk/txlib/include/txlib.h

@@ -1625 +1625 @@
-
-// Remove ANSI control code from a text-string (in place conversion)
-char *TxStripAnsiCodes                          // RET  
+ULONG TxStripAnsiCodes                          // RET   length
-(
-   char               *text                     // INOUT ANSI text to strip

trunk/txlib/include/txwin.h

@@ -84 +84 @@
-   TXW_BUTTON        = 7,                       // button - push/radio/checkbox
-   TXW_LISTBOX       = 8,                       // simple selection-list
+   TXW_HEXEDIT       = 9,                       // Hex (sector) editor
-} TXWCLASS;                                     // end of enum "txwclass"
-
@@ -315 +316 @@
-} TXSTLINE;                                     // end of struct "txstatic"
-
-
+                         // any button class
-{
-   BOOL               *checked;                 // button state
@@ -321 +322 @@
-} TXBUTTON;                                     // end of struct "txbutton"
-
-
+                        // listbox, popup/submenu
-{
-   short               cpos;                    // current position   (cursor)
@@ -334 +335 @@
-   TXSELIST           *list;                    // actual selection list data
-} TXLISTBOX;                                    // end of struct "txlistbox"
+
+
+typedef enum txhexedcmd
+{
+   TXHE_CB_UPD_DESC,                            // update buffer desc (hex/dec)
+   TXHE_CB_INIT_POS,                            // load initial buffers
+   TXHE_CB_NEXT_BUF,                            // make 'next' buffer current
+   TXHE_CB_PREV_BUF,                            // make 'prev' buffer current
+   TXHE_CB_TO_START,                            // to start of object
+   TXHE_CB_TO_FINAL,                            // to end of object
+   TXHE_CB_GOTOITEM,                            // go to specified item (sn)
+   TXHE_CB_FINDDATA,                            // find data, goto found item
+   TXHE_CB_FNDAGAIN,                            // find data again, same data
+   TXHE_CB_WRITEBUF,                            // write (changed) buffer
+} TXHEXEDCMD;                                   // end of enum "txhexedcmd"
+
+
+typedef ULONG (* TXHEXEDIT_CALLBACK)            // Hex editor action callback
+(
+   ULONG               cmd,                     // IN    action command
+   struct txhexedit   *data                     // INOUT hexedit data
+);
+
+
+typedef struct txhebuf                          // hex editor data buffer
+{
+   BYTE               *data;                    // start of data buffer
+   LLONG               start;                   // abs start position (ref)
+   ULONG               size;                    // size of buffer    (item)
+   TXLN                desc;                    // buffer description  (76)
+} TXHEBUF;                                      // end of struct "txhebuf"
+
+
+typedef struct txhexedit                        // hex editor control
+{
+   //- note: a negative offset in the buffer means the current item (buffer)
+   //-       is NOT at the top of the display, but further down, and part of
+   //-       the PREV buffer is also visible. (0 = buffer start at top-left)
+
+   LONG                posCurBuf;               // offset in buffer, 1st byte
+   LONG                posCursor;               // offset in screen, cursor
+   USHORT              hexLsb;                  // hex LSB nibble   (0 or 1)
+   USHORT              rows;                    // nr of rows shown    (16)
+   USHORT              cols;                    // nr of bytes per row (16)
+   BOOL                autocols;                // get 8/16/32/cols from width
+   BOOL                ascii;                   // cursor in ascii area
+   BOOL                decimal;                 // use decimal positions
+   TXHEBUF            *prev;                    // buffer BEFORE current one
+   TXHEBUF            *curr;                    // current buffer (item)
+   TXHEBUF            *next;                    // buffer AFTER  current one
+   BYTE               *diff;                    // difference buf (original)
+   ULONG               diffSize;                // size of difference buf
+   ULONG               currCrc;                 // 32-bit buf CRC (original)
+   void               *userdata;                // application user data
+   TXHEXEDIT_CALLBACK  actionCallback;          // application action handler
+} TXHEXEDIT;                                    // end of struct "txhexedit"
-
-
@@ -363 +420 @@
-      TXBUTTON         bu;                      // push- radio or checkbox
-      TXLISTBOX        lb;                      // listbox with selection list
+      TXHEXEDIT        he;                      // hex editor control
-   };
-} TXWINDOW;                                     // end of struct "txwindow"
@@ -409 +467 @@
-#define TXStdStatic(    text) "",   TXW_STATIC,     0, NULL, TXWgStatic(text)
-#define TXStdStline(    text) "",   TXW_STLINE,     0, NULL, TXWgStline(text)
-&(var)
+var
-#define TXStdLstBox(v,p,text) text, TXW_LISTBOX,    0, NULL, TXWgListbox((p),0,0,0,0,0,0,0,0,(v))
-
@@ -492 +550 @@
-#define TXVS_CLOSE_BUTTON     0x01000000        // include close button in border
-
+// TXHE_ hex editor control styles
+#define TXHE_CLOSE_BUTTON     0x01000000        // include close button in border
+#define TXHE_WRITE_PROMPT     0x10000000        // prompt before write-back
+#define TXHE_TAB_HTOGGLE      0x20000000        // TAB toggles hex/ascii
+
-//- often used Dialog frame/child window combinations
-
+
+
-#define TXWS_DIALOG   TXWS_STDWINDOW   | TXWS_FOURBORDERS
-
+ 
-#define TXWS_FRAMED   TXWS_CHILDWINDOW | TXWS_FOURBORDERS
-
-
-
-
-
-
+ 
+ 
+ 
+ 
+ 
+ 
-#define TXWS_EF_BASE  TXWS_EFOCUS      | TXES_DLGE_FIELD
-
+ 
-#define TXWS_ENTRYT   TXWS_ENTRYF      | TXWS_TITLEBORDER
-
+ 
-                                       | TXWS_BRACKETSIDE
-
-
+ 
+ 
-#define TXWS_OUTPUTT  TXWS_OUTPUT      | TXWS_TITLEBORDER
-#define TXWS_DROPMENU TXWS_CHILD_BASE  | TXLS_DROP_MENU
-#define TXWS_A_MENU   TXWS_DROPMENU    | TXWS_TITLEBORDER
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-// TXWM_COMMAND msg source codes
@@ -669 +735 @@
-#define TXLN_ENTER                   5
-
+// Hex edit tandard dialog flags
+#define TXHE_MOVEABLE                0x2000
-
-// Scroll-buffer related color conversions
@@ -963 +1031 @@
-   cMLEntTextStand,                             // Multi-line entry field text
-   cMLEntTextFocus,
+   cHexEdCurByteChg,                            // Hex Editor control
+   cHexEdCursorByte,
+   cHexEdHexByteStd,
+   cHexEdHexByteChg,
+   cHexEdAscByteStd,
+   cHexEdAscBracket,
+   cHexEdRelPosPrev,
+   cHexEdRelPosCurr,
+   cHexEdRelPosNext,
+   cHexEdAbsBytePos,
+   cHexEdAbsByteCur,
+   cHexEdRelCursorP,
+   cHexEdButtonText,
+   cHexEdButBracket,
+   cHexEdByteNumber,
+   cHexEdItemSnText,
+   cHexEdItemHlight,
+   cHexEdModifyText,
-   cNrOfSchemeColors
-} TXW_WINCOLORS;                                // end of enum "txw_wincolors"
@@ -1023 +1109 @@
-#define  TX_Red_on_White       (TXwCnW + TXwCNR)
-#define  TX_Magenta_on_White   (TXwCnW + TXwCNM)
+#define  TX_Brown_on_White     (TXwCnW + TXwCNY)
-#define  TX_Yellow_on_White    (TXwCnW + TXwCBY)
-#define  TX_Grey_on_White      (TXwCnW + TXwCBZ)
@@ -1043 +1130 @@
-#define  TX_Black_on_Magenta   (TXwCnM + TXwCNZ)
-#define  TX_White_on_Magenta   (TXwCnM + TXwCNW)
+#define  TX_Lcyan_on_Magenta   (TXwCnM + TXwCBC)
-#define  TX_Lwhite_on_Magenta  (TXwCnM + TXwCBW)
-#define  TX_Magenta_on_Magenta (TXwCnM + TXwCNM)
@@ -2037 +2125 @@
-);
-
-
+                    
-
-#define TXHELPITEM(nr,title) \
@@ -2064 +2152 @@
-);
-
+/*======== Hex Editor standard dialog, TXWHEXED.C ===========================*/
+
+// Initialize the Hex-editor dialog/control data structures
+// To be called by CUSTOM hex-editor control users (not standard dialog)
+BOOL txwInitHexeditDialogs
+(
+   void
+);
+
+// Display standard Hex editor dialog
+ULONG txwHexEditor
+(
+   TXWHANDLE           parent,                  // IN    parent window
+   TXWHANDLE           owner,                   // IN    owner  window
+   TXHEXEDIT          *hedat,                   // IN    hex edit data
+   char               *title,                   // IN    title for the dialog
+   ULONG               helpid,                  // IN    help on message
+   ULONG               flags                    // IN    specification flags
+);
+
-/*======== Window drawing functions, TXWDRAW.C ==============================*/
-
@@ -2094 +2202 @@
-);
-
+#define txwStringAt(r,c,s,a) txwDrawCharStrCol(hwnd,r,c,s,a)
-// Draw a character-string at position in specified color, using clip-rect
-void txwDrawCharStrCol

trunk/txlib/makefile.mif

@@ -137 +137 @@
- txwdraw.obj  txwhelp.obj  txwikey.obj  txwind.obj   txwutil.obj  &
- txwprint.obj txwproc.obj  txwstdlg.obj txwidget.obj txselist.obj &
-
+ txwhexed.obj
-winspec= &
- +txwdraw     +txwhelp     +txwikey     +txwind      +txwutil     &
- +txwprint    +txwproc     +txwstdlg    +txwidget    +txselist    &
-
+    +txwhexed
-!endif
-

trunk/txlib/txcon.c

@@ -75 +75 @@
-static  char  txc_ansi   = A_ON;
-
-
-0; 
+, first size includes closing message ...
+50;
-static  ULONG      log_maxsize = 0;             // maximum size per logfile
-static  ULONG      log_seq_num = 0;             // sequence number 0..n
@@ -542 +542 @@
-      if ((log_handle != 0) || (txh_clean != NULL))
-      {
-TxStripAnsiCodes( txm_buff);
+size = TxStripAnsiCodes( txm_buff);    // update size as well!
-         for (hinfo = txh_clean; hinfo != NULL; hinfo = hinfo->next)
-         {
@@ -564 +564 @@
-               TXLN    fname;
-
-
+
+
-               fprintf( log_handle, "\nClosing logfile at size limit\n");
-
@@ -570 +571 @@
-               if (log_seq_num >= log_retain)   // need to delete one
-               {
-
+
+
-                  remove( fname);               // delete a logfile (cycle)
-               }
-
+
+
-               TxAppendToLogFile( fname, FALSE); // open next logfile, quiet
-               log_handle  = TxQueryLogFile( &log7bit, &logreopen);
-
+
+
-            }
-            else
@@ -603 +607 @@
-// Remove ANSI control code from a text-string (in place conversion)
-/*****************************************************************************/
-char *TxStripAnsiCodes                          // RET  
-
+ULONG TxStripAnsiCodes                          // RET   length
+                                               //       corrected for CR/LF
-   char               *text                     // INOUT ANSI text to strip
-)
@@ -610 +614 @@
-   char               *rd = text;               // read-pointer in string
-   char               *wr = text;               // write pointer
+   ULONG               ls = 0;                  // length stripped string
-
-   while (*rd)
@@ -624 +629 @@
-      {
-         *(wr++) = *rd;                         // copy the character
+
+         #if !defined(LINUX)
+         if (*rd == '\n')                       // when end of line
+         {
+            ls++;                               // correct for CR/LF char
+         }
+         ls++;                                  // count for length
+         #endif
-      }
-      rd++;
-   }
-   *wr = '\0';                                  // terminate stripped string
-text
+ls
-}                                               // end 'TxStripAnsiCodes'
-/*---------------------------------------------------------------------------*/

trunk/txlib/txlogfil.c

@@ -181 +181 @@
-(
-   ULONG               seq,                     // IN    sequence number
+   ULONG               retain,                  // IN    nr of files kept
-   TXLN                buf                      // IN    filename buffer
-)
@@ -193 +194 @@
-   else
-   {
+      if ((seq >= 100) && (retain < 100))       // OK to use modulo seq ?
+      {
+         seq %= 100;                            // reduce to two digits, to
+      }                                         // limit extension to three
-      sprintf( ext, "l%02lu", seq);
-   }

trunk/txlib/txparse.c

@@ -249 +249 @@
-
-/*****************************************************************************/
-// Get option value num/string, with bytes/kilo/mega/giga modifier and default
-/*****************************************************************************/
-ULONG TxaOptBkmg                                // RET   number value in bytes
-(
-   TXHANDLE            txh,                     // IN    TXA handle
-   char                option,                  // IN    option character
-   ULONG               def,                     // IN    default value
-   BYTE                mod                      // IN    b,kb,mb,gb modifier
-)
-{
-   ULONG               rc = 0;                  // function return
-   BYTE                unit = TXA_DFUNIT;
-   TXA_OPTION         *opt;                     // option pointer
-
-   ENTER();
-   TRACES(("Option: '%c' default: %8.8lx mod:%2.2hx = '%c'\n",
-            option, def, mod, mod));
-
-   if ((opt = TxaOptValue( option)) != NULL)    // get the option details
-   {
-      switch (opt->type)
-      {
-         case TXA_STRING:
-            rc   = TxaParseNumber( opt->value.string, TX_RADIX_STD_CLASS, &unit);
-         case TXA_NO_VAL:
-            rc   = def;
-            break;
-
-         default:                               // convert, default is MiB!
-            rc   = opt->value.number;
-            unit = opt->unit;
-            break;
-      }
-   }
-   if (unit == TXA_DFUNIT)
-   {
-      unit = mod;
-   }
-   switch (tolower(unit))
-   {
-      case 'g':
-         if (rc >= 4)
-         {
-            rc = 0xffffffff;
-            break;
-         }
-         else
-         {
-            rc *= 1024;                         // Giga
-         }
-      case 'm': rc *= 1024;                     // Mega
-      case 'k': rc *= 1024;                     // Kilo
-      default:  break;                          // Bytes, OK
-   }
-   RETURN (rc);
-}                                               // end 'TxaParseBkmgNumber'
-/*---------------------------------------------------------------------------*/
-
-
-/*****************************************************************************/
-// Read one item (option or argument) and store it in the txa element
-/*****************************************************************************/
@@ -780 +720 @@
-   switch (tolower(unit))
-   {
-
+
+
+
+
+
+
+
+
+
+
-      case 'm': rc *= 1024;                     // Mega
-      case 'k': rc *= 1024;                     // Kilo

trunk/txlib/txstdcmd.c

@@ -97 +97 @@
-   if (stricmp(c0, "log"      ) == 0)
-   {
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-   }
-   else if (stricmp(c0, "trace"    ) == 0)
-   {
-(c1[0] == '?') || 
+
-      {
-         TxPrint( "\nSet and check TRACE level, format and destinations\n\n"
- trace  [-r] [-s] [-t] [level | filename
+trace [level | filename] [-r] [-s] [-t] [-d] [-f] [-m
-                  "   -d[:xx]      add xx ms delay for each trace line, slowdown\n"
-                  "   -f[:ff]      retain ff numbered logfiles when cycling\n"
-
+ Kb
-                  "   -r           close and reopen log on each line (slow)\n"
-                  "   -r-          open log just once (this is the default)\n"
@@ -266 +279 @@
-      char            *filter[5] = {NULL,NULL,NULL,NULL,NULL};
-
- || (c1[0] == '?'))
+)                  
-      {
-         TxPrint("\nShow files and/or directories in selectable format\n");

trunk/txlib/txvers.h

@@ -40 +40 @@
-// Originally developed for LPTool/DFSee utilities, open-sourced in 2005
-//
-
+
+
+
+
+
+
+
+
+
+
+
-//efine TXLIB_V "1.07 04-05-2006" // JvW Avoid (history) popup from other list
-//efine TXLIB_V "1.07 02-05-2006" // JvW Ctrl-D on cmdline, auto NEXT history

trunk/txlib/txwdraw.c

@@ -461 +461 @@
-         fill.top    = fill.bottom;
-         txwIntersectRect( &clip, &fill, &fill);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-         }
-      }
@@ -506 +510 @@
-         fill.bottom = fill.top;
-         txwIntersectRect( &clip, &fill, &fill);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-