New UI

.gitignore

@@ -10,3 +10,6 @@ build/
 #CMake stuff
 CMakeCache.txt
 CMakeFiles
+
+research/
+test data/

CMakeLists.txt

@@ -4,10 +4,7 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 add_subdirectory(ccos_image)
 
-project(GRiDISKCOM LANGUAGES CXX)
-
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-include_directories(ccos_image)
+project(GRiDISKCOM LANGUAGES CXX C)
 
 set(CMAKE_AUTOUIC ON)
 set(CMAKE_AUTOMOC ON)
@@ -23,30 +20,63 @@ if(WIN32)
     set(GUI_TYPE WIN32)
 endif()
 
+include_directories(${CMAKE_SOURCE_DIR})
+include_directories(ccos_image)
+include_directories(ui)
+include_directories(ui/dialogs)
+include_directories(ui/preview)
+include_directories(common)
+
+
 add_executable(GRiDISKCOM ${GUI_TYPE}
         main.cpp
-        dialogs/mainwindow.cpp
-        dialogs/mainwindow.h
-        dialogs/mainwindow.ui
-        dialogs/abdlg.cpp
-        dialogs/abdlg.h
-        dialogs/abdlg.ui
-        dialogs/chsedlg.cpp
-        dialogs/chsedlg.h
-        dialogs/chsedlg.ui
-        dialogs/custdlg.cpp
-        dialogs/custdlg.h
-        dialogs/custdlg.ui
-        dialogs/datedlg.cpp
-        dialogs/datedlg.h
-        dialogs/datedlg.ui
-        dialogs/rendlg.cpp
-        dialogs/rendlg.h
-        dialogs/rendlg.ui
-        dialogs/verdlg.cpp
-        dialogs/verdlg.h
-        dialogs/verdlg.ui
-        icon/icon.qrc
+        common/imd2raw.c
+        common/imd2raw.h
+        common/diskconstants.h
+        common/mbr.cpp
+        common/mbr.h
+        common/omf_record.cpp
+        common/omf_record.h
+        ui/mainwindow.cpp
+        ui/mainwindow.h
+        ui/mainwindow.ui
+        ui/filepanelwidget.cpp
+        ui/filepanelwidget.h
+        ui/themedicon.h
+        ui/dialogs/about.cpp
+        ui/dialogs/about.h
+        ui/dialogs/about.ui
+        ui/dialogs/customdisk.cpp
+        ui/dialogs/customdisk.h
+        ui/dialogs/customdisk.ui
+        ui/dialogs/imagewizard.cpp
+        ui/dialogs/imagewizard.h
+        ui/dialogs/date.cpp
+        ui/dialogs/date.h
+        ui/dialogs/date.ui
+        ui/dialogs/partition.cpp
+        ui/dialogs/partition.h
+        ui/dialogs/partition.ui
+        ui/dialogs/rename.cpp
+        ui/dialogs/rename.h
+        ui/dialogs/rename.ui
+        ui/dialogs/version.cpp
+        ui/dialogs/version.h
+        ui/dialogs/version.ui
+        ui/preview/file.h
+        ui/preview/dialog.cpp
+        ui/preview/dialog.h
+        ui/preview/text.cpp
+        ui/preview/text.h
+        ui/preview/canvas.cpp
+        ui/preview/canvas.h
+        ui/preview/font.cpp
+        ui/preview/font.h
+        ui/preview/worksheet.cpp
+        ui/preview/worksheet.h
+        ui/preview/database.cpp
+        ui/preview/database.h
+        ui/resources/icon.qrc
         execico.rc
         )
 

README.md

@@ -26,6 +26,14 @@ git submodule init
 git submodule update
 ```
 
+## Building
+Configure and build the project in a `build` directory with CMake:
+```
+cmake -S . -B build
+cmake --build build
+```
+After building, the resulting `GRiDISKCOM` executable will be located in the `build` directory.
+
 ## Special thanks to
 * [BOOtak](https://github.com/BOOtak) for first testing, bugfixes and [core library](https://github.com/BOOtak/CCOS-disk-utils) for this application.
 * [vklachkov](https://github.com/vklachkov) for the current project maintenance.

common/diskconstants.h

@@ -0,0 +1,18 @@
+#ifndef DISKCONSTANTS_H
+#define DISKCONSTANTS_H
+
+#include <cstdint>
+
+constexpr uint16_t GRID_BUBBLE_SECTOR_SIZE = 256;
+constexpr uint16_t GRID_BUBBLE_SUPERBLOCK_FID = 0x3FE;
+constexpr uint16_t GRID_BUBBLE_BITMAP_FID = 0x3FD;
+
+constexpr uint16_t GRID_FLOPPY_SECTOR_SIZE = 512;
+constexpr uint16_t GRID_FLOPPY_SUPERBLOCK_FID = 0x121;
+constexpr uint16_t GRID_FLOPPY_BITMAP_FID = 0x120;
+
+constexpr uint16_t GRID_HDD_SECTOR_SIZE = 512;
+constexpr uint16_t GRID_HDD_SUPERBLOCK_FID = 0x2420;
+constexpr uint16_t GRID_HDD_BITMAP_FID = 0x2400;
+
+#endif  // DISKCONSTANTS_H

common/imd2raw.c

@@ -0,0 +1,253 @@
+/*
+ * Fixes to sort sector list so that images with skews are correct
+ * Verified by actually comparing IMDU /B output byte for byte
+ *
+ * David Schmidt
+ * December, 2022
+ * July, 2026: optional padding of missing sectors
+ */
+
+/* originally from the bitsavers/convergent directory
+ *
+ * Used stdin/stdout that won't work in Windows.  Files
+ * must be opened explicity in binary mode for both input and output
+ *
+ * Testing: Converts *.IMD file identical to IMDU /B as verified
+ * by both size and an MD5 cryptographic hash.
+ *
+ * Tom Burnett
+ * December, 2013
+ */
+#include "imd2raw.h"
+
+#include <stdio.h>
+#include <string.h>
+#include <time.h>
+#include <stdlib.h>
+
+/*
+ * IMD image format
+ *
+ * IMD v.v: dd/mm/yyy hh:mm:ss (ascii header, optional)
+ * comment terminated with 0x1a
+ * for each track
+ *  char mode (0-5)
+ *  char cylinder
+ *  char head (including additional optional bits, below)
+ *  char sector count
+ *  char sector size (0-6)
+ *  sector numbering map
+ *  optional cylinder map (head & 0x40)
+ *  optional head map (head & 0x80)
+ *  sector data records (type) (val, or data)
+ */
+
+char *modetbl[] = { "500K FM", "300K FM", "250K FM", "500K MFM", "300K MFM", "250K MFM" };
+
+FILE *fpin, *fpout;
+int fill_missing = 0;
+unsigned int highwater[7] = {0};
+
+int comp (const void * elem1, const void * elem2)
+{
+    unsigned char f = *((int*)elem1);
+    unsigned char s = *((int*)elem2);
+    if (f > s) return  1;
+    if (f < s) return -1;
+    return 0;
+}
+
+/* Integrated into GRiDISKCOM: this used to be main()/stdin/stdout that
+ * called exit() on error. It is now imd2raw_convert(infile, outfile) which
+ * returns a negative code on error, so it is safe to call from the GUI.
+ * The conversion algorithm below is unchanged. */
+int imd2raw_convert(const char *infile, const char *outfile)
+{
+    unsigned char sectormap[32];
+    unsigned char sectormapsorted[32];
+    unsigned char secdisp[32];
+    unsigned char secdata[64][8192];
+    unsigned int mode, cyl, hd, seccnt, headflags, sizecode;
+    unsigned int secsiz = 0;
+    int i, j;
+    unsigned char c, value, fill;
+
+    if ((fpin = fopen(infile, "rb")) == NULL) {
+        return -1;
+    }
+
+    if ((fpout = fopen(outfile, "wb")) == NULL) {
+        fclose(fpin);
+        return -2;
+    }
+
+    /* Turns out this is a "later" construct, earlier examples may just have a 0x1a terminated comment
+    if( (fgetc(fpin) != 'I') || (fgetc(fpin) != 'M') || (fgetc(fpin) != 'D') ) {
+        fprintf(stderr,"File doesn't start with 'IMD'\n");
+        leave(4);
+    }
+    */
+
+    // Lop off initial comments
+    while(1) {
+        c = fgetc(fpin);
+        if(c == 0x1a)
+            break;
+    }
+
+    while(1) {
+        c = fgetc(fpin);
+        if(feof(fpin)) break;
+        mode   = c;
+        if(mode > 6) {
+            fclose(fpin);
+            fclose(fpout);
+            return -4;
+        }
+        cyl    = fgetc(fpin);
+        if(cyl > 80) {
+            fclose(fpin);
+            fclose(fpout);
+            return -5;
+        }
+        c      = fgetc(fpin);
+        hd = c & 0x0f;
+        headflags = c & 0xf0;
+        if(hd > 1) {
+            fclose(fpin);
+            fclose(fpout);
+            return -6;
+        }
+        seccnt = fgetc(fpin);
+
+        sizecode = fgetc(fpin);
+        c = sizecode;
+
+        switch(c) {
+            case 0:
+                secsiz = 128;
+                break;
+            case 1:
+                secsiz = 256;
+                break;
+            case 2:
+                secsiz = 512;
+                break;
+            case 3:
+                secsiz = 1024;
+                break;
+            case 4:
+                secsiz = 2048;
+                break;
+            case 5:
+                secsiz = 4096;
+                break;
+            case 6:
+                secsiz = 8192;
+                break;
+            default:
+                break;
+        }
+
+        if (seccnt > highwater[sizecode])
+            highwater[sizecode] = seccnt;
+
+        // fprintf(stderr,"Cyl:%d Hd:%d %s %d sectors size %d\n", cyl, hd, modetbl[mode], seccnt, secsiz);
+
+        // copy sector/interleave map
+        for (i=0; i < seccnt; i++) {
+            sectormap[i] = fgetc(fpin);
+            sectormapsorted[i] = sectormap[i];
+        }
+        // Sort the sectors in case of skew
+        // qsort(sectormapsorted, seccnt, 1, comp);
+        // fprintf(stderr,"Tbl ");
+        // for (i=0; i < seccnt; i++) fprintf(stderr,"%d ",sectormap[i]);
+        // fprintf(stderr, "\n");
+        // fprintf(stderr,"Srt ");
+        // for (i=0; i < seccnt; i++) fprintf(stderr,"%d ",sectormapsorted[i]);
+        // fprintf(stderr, "\n");
+
+        if ((headflags & 64) == 64)
+        {
+          // Pull out "optional" cylinder map, discard
+          for (int i = 0; i < seccnt; i++)
+            c = fgetc(fpin);
+        }
+        if ((headflags & 128) == 128)
+        {
+          // Pull out "optional" head map, discard
+          for (int i = 0; i < seccnt; i++)
+            c = fgetc(fpin);
+        }
+
+        // copy sector information indexed by the sector number
+        for (i=0; i < seccnt; i++) {
+            c = fgetc(fpin);
+
+            switch(c) {
+                case 0:            // Sector data unavailable - could not be read
+                case 5:            // Deleted address marks
+                case 7:            // Bad sector
+                    secdisp[i] = 'X';
+                    fill = 0xE5;
+                    for(j=0; j < secsiz; j++) {
+                        if (c > 0)
+                          fill = fgetc(fpin); // Grab whatever IMD wrote
+                        secdata[sectormap[i]][j] = fill;
+                    }
+                    // fprintf(stderr,"Cyl %d Hd %d Sec %d bad, type %d\n",cyl,hd,sectormap[i],c);
+                    break;
+
+                case 1:            // normal data 'secsiz' bytes follow
+                    secdisp[i] = '.';
+                    for(j=0; j < secsiz; j++)
+                        secdata[sectormap[i]][j] = fgetc(fpin);
+                    break;
+
+                case 3:            // data with 'deleted data' address mark
+                    secdisp[i] = 'd';
+                    for(j=0; j < secsiz; j++)
+                        secdata[sectormap[i]][j] = fgetc(fpin);
+                    break;
+
+                case 2:            // compressed with value in next byte
+                case 4:
+                case 6:
+                case 8:
+                    secdisp[i] = 'C';
+                    value = fgetc(fpin);
+                    for(j=0; j < secsiz; j++)
+                        secdata[sectormap[i]][j] = value;
+                    // fprintf(stderr,"Cyl %d Hd %d Sec %d all %x\n",cyl,hd,sectormap[i],value);
+                    break;
+            }
+        }
+
+        if (fill_missing && seccnt < highwater[sizecode]) {
+            unsigned char present[64] = {0};
+            for (i = 0; i < seccnt; i++)
+                present[sectormap[i]] = 1;
+            for (i = 1; i <= highwater[sizecode]; i++) {
+                if (!present[i]) {
+                    for (j = 0; j < secsiz; j++)
+                        secdata[i][j] = 0x00;
+                    sectormap[seccnt] = i;
+                    sectormapsorted[seccnt] = i;
+                    secdisp[seccnt] = '0';
+                    seccnt++;
+                }
+            }
+        }
+        qsort(sectormapsorted, seccnt, 1, comp);
+
+        for(i=0; i<seccnt; i++) {
+            for(j=0; j < secsiz; j++) {
+                fputc(secdata[sectormapsorted[i]][j], fpout);
+            }
+        }
+    }
+    fclose(fpin);
+    fclose(fpout);
+    return(0);
+}