Changeset 53c4be3 in thomson for elec/CrO2/software/gui.cpp

Timestamp:

Feb 5, 2012, 3:25:32 PM (12 years ago)

Author:

Adrien Destugues <pulkomandy@…>

Branches:

main

Children:

1b74fa2

Parents:

c2a9854

Message:

• Support for ZX spectrup TAP files.

git-svn-id: ​svn://localhost/thomson@17 85ae3b6b-dc8f-4344-a89d-598714f2e4e5

File:

• elec/CrO2/software/gui.cpp (modified) (9 diffs)

elec/CrO2/software/gui.cpp

@@ -13 +13 @@
 #include <string.h>
 #include <sstream>
-#include <iostream>
+#include <ios>
 
 #include <iupcontrols.h>
@@ -94 +94 @@
         Callback<Gui, int, int, int>::create(blocklist, "SELECTION_CB", this, &Gui::selectBlock);
 
-        Ihandle* hexEd = IupMatrix(NULL);
+        hexEd = IupMatrix(NULL);
 
         // Setup title cells
-        IupSetAttribute(hexEd, "NUMLIN", "16");
+        IupSetAttribute(hexEd, "FONT", "Courier, 10");
+        IupSetAttribute(hexEd, "FONT*:17", "Courier, 10");
         IupSetAttribute(hexEd, "NUMCOL", "17");
-        IupSetAttribute(hexEd, "WIDTHDEF", "12");
-        IupSetAttribute(hexEd, "WIDTH17", "48");
-        IupSetAttribute(hexEd, "USETITLESIZE", "YES");
-        IupSetAttribute(hexEd, "FONT", "Courier, Bold 12");
+        IupSetAttribute(hexEd, "WIDTHDEF", "10");
+        IupSetAttribute(hexEd, "WIDTH17", "105");
+        IupSetAttribute(hexEd, "WIDTH0", "12");
+        IupSetAttribute(hexEd, "HEIGHT0", "8");
+        IupSetAttribute(hexEd, "SIZE", "400x230");
         IupSetAttribute(hexEd, "EXPAND", "YES");
+        IupSetAttribute(hexEd, "ALIGNMENT", "ALEFT");
         Callback<Gui, const char*, int, int>::create(hexEd, "VALUE_CB", this, &Gui::matVal);
         
@@ -173 +176 @@
         {
                 // Load file
-                file = new K5(name);
+                try {
+                        file = Tape::load(name);
+                } catch (const char* error) {
+                        puts(error);
+                        return IUP_DEFAULT;
+                }
 
                 // Fill in EXPLORE tab
@@ -179 +187 @@
                 int lastfile = -1;
 
+                IupSetAttribute(blocklist, "DELNODE", "ALL");
+
                 for (int i = 0; i < count; ++i)
                 {
-                        const K5::Block& blk = file->getBlock(i);
-                        switch(blk.type)
+                        const Tape::Block& blk = file->getBlock(i);
+                        if (blk.isFile())
                         {
-                                case 0:
-                                        //start block
-                                        char name[12];
-                                        memcpy(name, blk.data, 11);
-                                        name[11] = 0;
-                                        
-                                        IupSetAttributeId(blocklist, "INSERTBRANCH", lastfile, name);
-                                        lastfile = i;
-                                        break;
-                                case 0xFF:
-                                        // end block
-                                        IupSetAttributeId(blocklist, "ADDLEAF", i-1, "EOF");
+                                IupSetAttributeId(blocklist, "INSERTBRANCH", lastfile, blk.getName().c_str());
+                                lastfile = i;
+                        } else {
+                                IupSetAttributeId(blocklist, "ADDLEAF", i-1, blk.getName().c_str());
+                                if (blk.isControl())
                                         IupSetAttributeId(blocklist, "IMAGE", i, "IMGLEAF");
-                                        break;
-                                default:
-                                        // regular block
-                                        IupSetAttributeId(blocklist, "ADDLEAF", i-1, "DATA");
-                                        break;
                         }
                 }
@@ -217 +215 @@
         if (what)
         {
-                IupSetAttribute(hexEd, "REDRAW", "ALL");
+                selblock = id;
+                std::ostringstream att;
+                att << (file->getBlock(id).length / 16);
+                IupSetAttribute(hexEd, "NUMLIN", att.str().c_str());
+
+                IupSetAttribute(hexEd, IUP_REDRAW, "ALL");
+        } else if (selblock == id) {
+                selblock = -1;
         }
 
@@ -223 +228 @@
 }
 
-const char* Gui::matVal(int x, int y)
-{
-        if (x == 0)
-        {
-                switch(y)
+const char* Gui::matVal(int y, int x)
+{
+        if (y == 0)
+        {
+                switch(x)
                 {
                         case 0:
@@ -237 +242 @@
                                 std::ostringstream name;
                                 name << std::hex;
-                                name << (y-1);
+                                name << (x-1);
                                 return name.str().c_str();
                         }
@@ -243 +248 @@
         }
 
-        if (y == 0)
-        {
-                return "C";
-        }
-
-        return "V";
+        if (x == 0)
+        {
+                std::ostringstream name;
+                name << std::hex;
+                name << (y-1)*16;
+                return name.str().c_str();
+        }
+
+        if (file == NULL || selblock < 0 || selblock >= file->getBlockCount())
+                return "";
+        const Tape::Block& block = file->getBlock(selblock);
+
+        if (x == 17)
+        {
+                int off = (y-1)*16;
+                std::ostringstream txt;
+                for(int j = 0; j < 16; j++)
+                {
+                        if (off + j >= block.length)
+                                break;
+                        char c = block.data[off+j];
+                        if (isprint(c))
+                                txt << c;
+                        else
+                                txt << '.';
+                }
+                return txt.str().c_str();
+        } else {
+
+                int pos = (y-1) * 16 + (x-1);
+                if (pos >= block.length)
+                        return "";
+
+                return toHex(block.data[pos]);
+        }
 }
 
@@ -263 +297 @@
         return IUP_DEFAULT;
 }
+
+const char* Gui::toHex(int val)
+{
+        std::ostringstream str;
+        str.flags(std::ios_base::hex | std::ios_base::uppercase);
+        str.width(2);
+        str.fill('0');
+        str << val;
+        return str.str().c_str();
+}