GUI: colored pattern view

src/engine/engine.cpp

@@ -144,7 +144,7 @@ bool DivEngine::isFMSystem(DivSystem sys) {
 const char* chanNames[11][17]={
   {"Channel 1", "Channel 2", "Channel 3", "Channel 4", "Channel 5", "Channel 6", "Channel 7", "Channel 8", "Channel 9", "Channel 10", "Channel 11", "Channel 12", "Channel 13", "Channel 14", "Channel 15", "Channel 16", "PCM"}, // YMU759
   {"FM 1", "FM 2", "FM 3", "FM 4", "FM 5", "FM 6", "Square 1", "Square 2", "Square 3", "Noise"}, // Genesis
-  {"FM 1", "FM 2", "FM 3 Operator 1", "FM 3 Operator 2", "FM 3 Operator 3", "FM 3 Operator 4", "FM 4", "FM 5", "FM 6", "Square 1", "Square 2", "Square 3", "Noise"}, // Genesis (extended channel 3)
+  {"FM 1", "FM 2", "FM 3 OP1", "FM 3 OP2", "FM 3 OP3", "FM 3 OP4", "FM 4", "FM 5", "FM 6", "Square 1", "Square 2", "Square 3", "Noise"}, // Genesis (extended channel 3)
   {"Square 1", "Square 2", "Square 3", "Noise"}, // SMS
   {"Pulse 1", "Pulse 2", "Wavetable", "Noise"}, // GB
   {"Channel 1", "Channel 2", "Channel 3", "Channel 4", "Channel 5", "Channel 6"}, // PCE
@@ -152,7 +152,7 @@ const char* chanNames[11][17]={
   {"Channel 1", "Channel 2", "Channel 3"}, // C64
   {"FM 1", "FM 2", "FM 3", "FM 4", "FM 5", "FM 6", "FM 7", "FM 8", "Sample 1", "Sample 2", "Sample 3", "Sample 4", "Sample 5"}, // Arcade
   {"FM 1", "FM 2", "FM 3", "FM 4", "Square 1", "Square 2", "Square 3", "Sample 1", "Sample 2", "Sample 3", "Sample 4", "Sample 5", "Sample 6"}, // YM2610
-  {"FM 1", "FM 2 Operator 1", "FM 2 Operator 2", "FM 2 Operator 3", "FM 2 Operator 4", "FM 3", "FM 4", "Square 1", "Square 2", "Square 3", "Sample 1", "Sample 2", "Sample 3", "Sample 4", "Sample 5", "Sample 6"}, // YM2610 (extended channel 2)
+  {"FM 1", "FM 2 OP1", "FM 2 OP2", "FM 2 OP3", "FM 2 OP4", "FM 3", "FM 4", "Square 1", "Square 2", "Square 3", "Sample 1", "Sample 2", "Sample 3", "Sample 4", "Sample 5", "Sample 6"}, // YM2610 (extended channel 2)
 };
 
 const char* chanShortNames[11][17]={
@@ -1164,10 +1164,22 @@ void DivEngine::reset() {
   dispatch->reset();
 }
 
+int DivEngine::getMaxVolumeChan(int ch) {
+  return chan[ch].volMax>>8;
+}
+
 unsigned char DivEngine::getOrder() {
   return curOrder;
 }
 
+int DivEngine::getRow() {
+  return curRow;
+}
+
+bool DivEngine::isPlaying() {
+  return playing;
+}
+
 void DivEngine::setOrder(unsigned char order) {
   isBusy.lock();
   curOrder=order;
@@ -1357,3 +1369,9 @@ bool DivEngine::init(String outName) {
   }
   return true;
 }
+
+bool DivEngine::quit() {
+  output->quit();
+  quitDispatch();
+  return true;
+}

src/engine/engine.h

@@ -125,6 +125,9 @@ class DivEngine {
     // get channel short name
     const char* getChannelShortName(int chan);
 
+    // get channel max volume
+    int getMaxVolumeChan(int chan);
+
     // get max STD volume
     int getMaxVolume();
 
@@ -137,6 +140,12 @@ class DivEngine {
     // get current order
     unsigned char getOrder();
 
+    // get current row
+    int getRow();
+
+    // is playing
+    bool isPlaying();
+
     // go to order
     void setOrder(unsigned char order);
 
@@ -158,6 +167,9 @@ class DivEngine {
     // initialize the engine. optionally provide an output file name.
     bool init(String outName="");
 
+    // terminate the engine.
+    bool quit();
+
     unsigned char* adpcmMem;
 
     DivEngine():
@@ -178,7 +190,7 @@ class DivEngine {
       totalCmds(0),
       lastCmds(0),
       cmdsPerSecond(0),
-      view(DIV_STATUS_PATTERN),
+      view(DIV_STATUS_NOTHING),
       audioEngine(DIV_AUDIO_SDL),
       bbInLen(0),
       temp{0,0},

src/engine/pattern.cpp

@@ -4,6 +4,10 @@ static DivPattern emptyPat;
 
 DivPattern::DivPattern() {
   memset(data,-1,256*16);
+  for (int i=0; i<256; i++) {
+    data[i][0]=0;
+    data[i][1]=0;
+  }
 }
 
 DivPattern* DivChannelData::getPattern(int index, bool create) {
@@ -17,6 +21,7 @@ DivPattern* DivChannelData::getPattern(int index, bool create) {
   return data[index];
 }
 
-DivChannelData::DivChannelData() {
+DivChannelData::DivChannelData():
+  effectRows(1) {
   memset(data,0,128*sizeof(void*));
 }

src/gui/gui.cpp

@@ -1,5 +1,6 @@
 #include "gui.h"
 #include "SDL_events.h"
+#include "SDL_render.h"
 #include "SDL_video.h"
 #include "fonts.h"
 #include "../ta-log.h"
@@ -19,6 +20,44 @@ const int _SIXTY_FOUR=64;
 const int _ONE_HUNDRED=100;
 const int _ONE_HUNDRED_TWENTY_SEVEN=127;
 
+const FurnaceGUIColors fxColors[16]={
+  GUI_COLOR_PATTERN_EFFECT_MISC, // 00
+  GUI_COLOR_PATTERN_EFFECT_PITCH, // 01
+  GUI_COLOR_PATTERN_EFFECT_PITCH, // 02
+  GUI_COLOR_PATTERN_EFFECT_PITCH, // 03
+  GUI_COLOR_PATTERN_EFFECT_PITCH, // 04
+  GUI_COLOR_PATTERN_EFFECT_VOLUME, // 05
+  GUI_COLOR_PATTERN_EFFECT_VOLUME, // 06
+  GUI_COLOR_PATTERN_EFFECT_VOLUME, // 07
+  GUI_COLOR_PATTERN_EFFECT_PANNING, // 08
+  GUI_COLOR_PATTERN_EFFECT_SPEED, // 09
+  GUI_COLOR_PATTERN_EFFECT_VOLUME, // 0A
+  GUI_COLOR_PATTERN_EFFECT_SONG, // 0B
+  GUI_COLOR_PATTERN_EFFECT_TIME, // 0C
+  GUI_COLOR_PATTERN_EFFECT_SONG, // 0D
+  GUI_COLOR_PATTERN_EFFECT_INVALID, // 0E
+  GUI_COLOR_PATTERN_EFFECT_SPEED, // 0F
+};
+
+const FurnaceGUIColors extFxColors[16]={
+  GUI_COLOR_PATTERN_EFFECT_MISC, // E0
+  GUI_COLOR_PATTERN_EFFECT_PITCH, // E1
+  GUI_COLOR_PATTERN_EFFECT_PITCH, // E2
+  GUI_COLOR_PATTERN_EFFECT_MISC, // E3
+  GUI_COLOR_PATTERN_EFFECT_MISC, // E4
+  GUI_COLOR_PATTERN_EFFECT_PITCH, // E5
+  GUI_COLOR_PATTERN_EFFECT_INVALID, // E6
+  GUI_COLOR_PATTERN_EFFECT_INVALID, // E7
+  GUI_COLOR_PATTERN_EFFECT_INVALID, // E8
+  GUI_COLOR_PATTERN_EFFECT_INVALID, // E9
+  GUI_COLOR_PATTERN_EFFECT_MISC, // EA
+  GUI_COLOR_PATTERN_EFFECT_MISC, // EB
+  GUI_COLOR_PATTERN_EFFECT_TIME, // EC
+  GUI_COLOR_PATTERN_EFFECT_TIME, // ED
+  GUI_COLOR_PATTERN_EFFECT_SONG, // EE
+  GUI_COLOR_PATTERN_EFFECT_SONG, // EF
+};
+
 const int opOrder[4]={
   0, 2, 1, 3
 };
@@ -51,6 +90,11 @@ const char* FurnaceGUI::noteName(short note, short octave) {
   return noteNames[seek];
 }
 
+void FurnaceGUI::updateScroll(int amount) {
+  float lineHeight=(ImGui::GetTextLineHeight()+2*dpiScale);
+  nextScroll=lineHeight*amount;
+}
+
 bool FurnaceGUI::loop() {
   while (!quit) {
     SDL_Event ev;
@@ -109,8 +153,12 @@ bool FurnaceGUI::loop() {
     ImGui::EndMainMenuBar();
 
     if (ImGui::Begin("Playback")) {
-      ImGui::InputScalar("Speed 1",ImGuiDataType_U8,&e->song.speed1);
+      ImGui::InputText("Name",&e->song.name);
-      ImGui::InputScalar("Speed 2",ImGuiDataType_U8,&e->song.speed2);
+      ImGui::InputText("Author",&e->song.author);
+      ImGui::InputScalar("Speed 1",ImGuiDataType_U8,&e->song.speed1,&_ONE,&_THREE);
+      ImGui::InputScalar("Speed 2",ImGuiDataType_U8,&e->song.speed2,&_ONE,&_THREE);
+      ImGui::InputScalar("Highlight 1",ImGuiDataType_U8,&e->song.hilightA,&_ONE,&_THREE);
+      ImGui::InputScalar("Highlight 2",ImGuiDataType_U8,&e->song.hilightB,&_ONE,&_THREE);
       unsigned char ord=e->getOrder();
       if (ImGui::InputScalar("Order",ImGuiDataType_U8,&ord)) {
         e->setOrder(ord);
@@ -118,6 +166,7 @@ bool FurnaceGUI::loop() {
       if (ImGui::Button("Play")) {
         e->play();
       }
+      ImGui::SameLine();
       if (ImGui::Button("Stop")) {
         e->stop();
       }
@@ -126,7 +175,7 @@ bool FurnaceGUI::loop() {
 
     char selID[16];
     if (ImGui::Begin("Orders")) {
-      ImGui::BeginTable("OrdersTable",1+e->getChannelCount(e->song.system));
+      if (ImGui::BeginTable("OrdersTable",1+e->getChannelCount(e->song.system))) {
         ImGui::TableNextRow();
         ImGui::TableNextColumn();
         for (int i=0; i<e->getChannelCount(e->song.system); i++) {
@@ -155,6 +204,7 @@ bool FurnaceGUI::loop() {
 
         ImGui::EndTable();
       }
+    }
     ImGui::End();
 
     if (ImGui::Begin("Instruments")) {
@@ -470,8 +520,15 @@ bool FurnaceGUI::loop() {
       ImGui::PushFont(patFont);
       unsigned char ord=e->getOrder();
       int chans=e->getChannelCount(e->song.system);
+      ImGui::PushStyleVar(ImGuiStyleVar_CellPadding,ImVec2(0.0f,0.0f));
       if (ImGui::BeginTable("PatternView",chans+1,ImGuiTableFlags_BordersInnerV|ImGuiTableFlags_ScrollX|ImGuiTableFlags_ScrollY|ImGuiTableFlags_NoPadInnerX)) {
         ImGui::TableSetupColumn("pos",ImGuiTableColumnFlags_WidthFixed);
+        int curRow=e->getRow();
+        if (e->isPlaying()) updateScroll(curRow);
+        if (nextScroll>-0.5f) {
+          ImGui::SetScrollY(nextScroll);
+          nextScroll=-1.0f;
+        }
         ImGui::TableSetupScrollFreeze(1,1);
         for (int i=0; i<chans; i++) {
           ImGui::TableSetupColumn(fmt::sprintf("c%d",i).c_str(),ImGuiTableColumnFlags_WidthFixed);
@@ -487,39 +544,80 @@ bool FurnaceGUI::loop() {
         ImVec2 threeChars=ImVec2(oneCharSize*3.0f,lineHeight);
         ImVec2 twoChars=ImVec2(oneCharSize*2.0f,lineHeight);
         ImVec2 oneChar=ImVec2(oneCharSize,lineHeight);
-        for (int i=0; i<e->song.patLen; i++) {
+        int dummyRows=(ImGui::GetWindowSize().y/lineHeight)/2;
-          ImGui::TableNextRow();
+        for (int i=0; i<dummyRows-1; i++) {
+          ImGui::TableNextRow(0,lineHeight);
           ImGui::TableNextColumn();
-          ImGui::Text("%3d ",i);
+        }
+        for (int i=0; i<e->song.patLen; i++) {
+          ImGui::TableNextRow(0,lineHeight);
+          ImGui::TableNextColumn();
+          if (e->isPlaying() && oldRow==i) {
+            ImGui::TableSetBgColor(ImGuiTableBgTarget_RowBg0,0x40ffffff);
+          } else if (e->song.hilightB>0 && !(i%e->song.hilightB)) {
+            ImGui::TableSetBgColor(ImGuiTableBgTarget_RowBg0,ImGui::GetColorU32(uiColors[GUI_COLOR_PATTERN_HI_2]));
+          } else if (e->song.hilightA>0 && !(i%e->song.hilightA)) {
+            ImGui::TableSetBgColor(ImGuiTableBgTarget_RowBg0,ImGui::GetColorU32(uiColors[GUI_COLOR_PATTERN_HI_1]));
+          }
+          ImGui::TextColored(uiColors[GUI_COLOR_PATTERN_ROW_INDEX],"%3d ",i);
           for (int j=0; j<chans; j++) {
+            int chanVolMax=e->getMaxVolumeChan(j);
             DivPattern* pat=e->song.pat[j].getPattern(e->song.orders.ord[j][ord],true);
             ImGui::TableNextColumn();
 
             sprintf(id,"%s##PN_%d_%d",noteName(pat->data[i][0],pat->data[i][1]),i,j);
+            if (pat->data[i][0]==0 && pat->data[i][1]==0) {
+              ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_PATTERN_INACTIVE]);
+            } else {
+              ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_PATTERN_ACTIVE]);
+            }
             ImGui::Selectable(id,false,ImGuiSelectableFlags_NoPadWithHalfSpacing,threeChars);
+            ImGui::PopStyleColor();
 
             if (pat->data[i][2]==-1) {
+              ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_PATTERN_INACTIVE]);
               sprintf(id,"..##PI_%d_%d",i,j);
             } else {
+              ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_PATTERN_INS]);
               sprintf(id,"%.2X##PI_%d_%d",pat->data[i][2],i,j);
             }
             ImGui::SameLine(0.0f,0.0f);
             ImGui::Selectable(id,false,ImGuiSelectableFlags_NoPadWithHalfSpacing,twoChars);
+            ImGui::PopStyleColor();
 
             if (pat->data[i][3]==-1) {
               sprintf(id,"..##PV_%d_%d",i,j);
+              ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_PATTERN_INACTIVE]);
             } else {
+              int volColor=(pat->data[i][3]*127)/chanVolMax;
+              if (volColor>127) volColor=127;
               sprintf(id,"%.2X##PV_%d_%d",pat->data[i][3],i,j);
+              ImGui::PushStyleColor(ImGuiCol_Text,volColors[volColor]);
             }
             ImGui::SameLine(0.0f,0.0f);
             ImGui::Selectable(id,false,ImGuiSelectableFlags_NoPadWithHalfSpacing,twoChars);
+            ImGui::PopStyleColor();
 
             for (int k=0; k<e->song.pat[j].effectRows; k++) {
               int index=4+(k<<1);
               if (pat->data[i][index]==-1) {
                 sprintf(id,"..##PE%d_%d_%d",k,i,j);
+                ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_PATTERN_INACTIVE]);
               } else {
                 sprintf(id,"%.2X##PE%d_%d_%d",pat->data[i][index],k,i,j);
+                if (pat->data[i][index]<0x10) {
+                  ImGui::PushStyleColor(ImGuiCol_Text,uiColors[fxColors[pat->data[i][index]]]);
+                } else if (pat->data[i][index]<0x20) {
+                  ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY]);
+                } else if (pat->data[i][index]<0x30) {
+                  ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_PATTERN_EFFECT_SYS_SECONDARY]);
+                } else if (pat->data[i][index]<0xe0) {
+                  ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_PATTERN_EFFECT_INVALID]);
+                } else if (pat->data[i][index]<0xf0) {
+                  ImGui::PushStyleColor(ImGuiCol_Text,uiColors[extFxColors[pat->data[i][index]-0xe0]]);
+                } else {
+                  ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_PATTERN_EFFECT_INVALID]);
+                }
               }
               ImGui::SameLine(0.0f,0.0f);
               ImGui::Selectable(id,false,ImGuiSelectableFlags_NoPadWithHalfSpacing,twoChars);
@@ -530,15 +628,26 @@ bool FurnaceGUI::loop() {
               }
               ImGui::SameLine(0.0f,0.0f);
               ImGui::Selectable(id,false,ImGuiSelectableFlags_NoPadWithHalfSpacing,twoChars);
+              ImGui::PopStyleColor();
             }
           }
         }
+        for (int i=0; i<=dummyRows; i++) {
+          ImGui::TableNextRow(0,lineHeight);
+          ImGui::TableNextColumn();
         }
+        oldRow=curRow;
         ImGui::EndTable();
+      }
+      ImGui::PopStyleVar();
       ImGui::PopFont();
     }
     ImGui::End();
 
+    SDL_SetRenderDrawColor(sdlRend,uiColors[GUI_COLOR_BACKGROUND].x*255,
+                                   uiColors[GUI_COLOR_BACKGROUND].y*255,
+                                   uiColors[GUI_COLOR_BACKGROUND].z*255,
+                                   uiColors[GUI_COLOR_BACKGROUND].w*255);
     SDL_RenderClear(sdlRend);
     ImGui::Render();
     ImGui_ImplSDLRenderer_RenderDrawData(ImGui::GetDrawData());
@@ -571,10 +680,14 @@ bool FurnaceGUI::init() {
   ImGui::CreateContext();
 
   ImGui::StyleColorsDark();
+  ImGuiStyle& sty=ImGui::GetStyle();
+
+  sty.Colors[ImGuiCol_WindowBg]=uiColors[GUI_COLOR_FRAME_BACKGROUND];
+
   ImGui_ImplSDL2_InitForSDLRenderer(sdlWin);
   ImGui_ImplSDLRenderer_Init(sdlRend);
 
-  ImGui::GetStyle().ScaleAllSizes(dpiScale);
+  sty.ScaleAllSizes(dpiScale);
 
   if ((mainFont=ImGui::GetIO().Fonts->AddFontFromMemoryCompressedTTF(defFont_main_compressed_data,defFont_main_compressed_size,18*dpiScale))==NULL) {
     logE("could not load UI font!\n");
@@ -595,6 +708,7 @@ FurnaceGUI::FurnaceGUI():
   dpiScale(1),
   curIns(0),
   curOctave(3),
+  oldRow(0),
   arpMacroScroll(0),
   macroDragStart(0,0),
   macroDragAreaSize(0,0),
@@ -602,5 +716,41 @@ FurnaceGUI::FurnaceGUI():
   macroDragLen(0),
   macroDragMin(0),
   macroDragMax(0),
-  macroDragActive(false) {
+  macroDragActive(false),
+  nextScroll(-1.0f) {
+  uiColors[GUI_COLOR_BACKGROUND]=ImVec4(0.1f,0.1f,0.1f,1.0f);
+  uiColors[GUI_COLOR_FRAME_BACKGROUND]=ImVec4(0.0f,0.0f,0.0f,0.85f);
+  uiColors[GUI_COLOR_PATTERN_HI_1]=ImVec4(0.6f,0.6f,0.6f,0.2f);
+  uiColors[GUI_COLOR_PATTERN_HI_2]=ImVec4(0.5f,0.8f,1.0f,0.2f);
+  uiColors[GUI_COLOR_PATTERN_ROW_INDEX]=ImVec4(0.5f,0.8f,1.0f,1.0f);
+  uiColors[GUI_COLOR_PATTERN_ACTIVE]=ImVec4(1.0f,1.0f,1.0f,1.0f);
+  uiColors[GUI_COLOR_PATTERN_INACTIVE]=ImVec4(0.5f,0.5f,0.5f,1.0f);
+  uiColors[GUI_COLOR_PATTERN_INS]=ImVec4(0.4f,0.7f,1.0f,1.0f);
+  uiColors[GUI_COLOR_PATTERN_VOLUME_MIN]=ImVec4(0.0f,0.5f,0.0f,1.0f);
+  uiColors[GUI_COLOR_PATTERN_VOLUME_HALF]=ImVec4(0.0f,0.75f,0.0f,1.0f);
+  uiColors[GUI_COLOR_PATTERN_VOLUME_MAX]=ImVec4(0.0f,1.0f,0.0f,1.0f);
+  uiColors[GUI_COLOR_PATTERN_EFFECT_INVALID]=ImVec4(1.0f,0.0f,0.0f,1.0f);
+  uiColors[GUI_COLOR_PATTERN_EFFECT_PITCH]=ImVec4(1.0f,1.0f,0.0f,1.0f);
+  uiColors[GUI_COLOR_PATTERN_EFFECT_VOLUME]=ImVec4(0.0f,1.0f,0.0f,1.0f);
+  uiColors[GUI_COLOR_PATTERN_EFFECT_PANNING]=ImVec4(0.0f,1.0f,1.0f,1.0f);
+  uiColors[GUI_COLOR_PATTERN_EFFECT_SONG]=ImVec4(1.0f,0.0f,0.0f,1.0f);
+  uiColors[GUI_COLOR_PATTERN_EFFECT_TIME]=ImVec4(0.5f,0.0f,1.0f,1.0f);
+  uiColors[GUI_COLOR_PATTERN_EFFECT_SPEED]=ImVec4(1.0f,0.0f,1.0f,1.0f);
+  uiColors[GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY]=ImVec4(0.5f,1.0f,0.0f,1.0f);
+  uiColors[GUI_COLOR_PATTERN_EFFECT_SYS_SECONDARY]=ImVec4(0.0f,1.0f,0.5f,1.0f);
+  uiColors[GUI_COLOR_PATTERN_EFFECT_MISC]=ImVec4(0.3f,0.3f,1.0f,1.0f);
+
+  for (int i=0; i<63; i++) {
+    ImVec4 col1=uiColors[GUI_COLOR_PATTERN_VOLUME_MIN];
+    ImVec4 col2=uiColors[GUI_COLOR_PATTERN_VOLUME_HALF];
+    ImVec4 col3=uiColors[GUI_COLOR_PATTERN_VOLUME_MAX];
+    volColors[i]=ImVec4(col1.x+((col2.x-col1.x)*float(i)/64.0f),
+                        col1.y+((col2.y-col1.y)*float(i)/64.0f),
+                        col1.z+((col2.z-col1.z)*float(i)/64.0f),
+                        1.0f);
+    volColors[i+64]=ImVec4(col2.x+((col3.x-col2.x)*float(i)/64.0f),
+                           col2.y+((col3.y-col2.y)*float(i)/64.0f),
+                           col2.z+((col3.z-col2.z)*float(i)/64.0f),
+                           1.0f);
+  }
 }

src/gui/gui.h

@@ -4,6 +4,34 @@
 #include "imgui_impl_sdlrenderer.h"
 #include <SDL.h>
 
+enum FurnaceGUIColors {
+  GUI_COLOR_BACKGROUND=0,
+  GUI_COLOR_FRAME_BACKGROUND,
+  GUI_COLOR_HEADER,
+  GUI_COLOR_ITEM_BACKGROUND,
+  GUI_COLOR_ITEM_FOREGROUND,
+  GUI_COLOR_PATTERN_HI_1,
+  GUI_COLOR_PATTERN_HI_2,
+  GUI_COLOR_PATTERN_ROW_INDEX,
+  GUI_COLOR_PATTERN_ACTIVE,
+  GUI_COLOR_PATTERN_INACTIVE,
+  GUI_COLOR_PATTERN_INS,
+  GUI_COLOR_PATTERN_VOLUME_MAX,
+  GUI_COLOR_PATTERN_VOLUME_HALF,
+  GUI_COLOR_PATTERN_VOLUME_MIN,
+  GUI_COLOR_PATTERN_EFFECT_INVALID,
+  GUI_COLOR_PATTERN_EFFECT_PITCH,
+  GUI_COLOR_PATTERN_EFFECT_VOLUME,
+  GUI_COLOR_PATTERN_EFFECT_PANNING,
+  GUI_COLOR_PATTERN_EFFECT_SONG,
+  GUI_COLOR_PATTERN_EFFECT_TIME,
+  GUI_COLOR_PATTERN_EFFECT_SPEED,
+  GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
+  GUI_COLOR_PATTERN_EFFECT_SYS_SECONDARY,
+  GUI_COLOR_PATTERN_EFFECT_MISC,
+  GUI_COLOR_MAX
+};
+
 class FurnaceGUI {
   DivEngine* e;
 
@@ -18,8 +46,10 @@ class FurnaceGUI {
 
   ImFont* mainFont;
   ImFont* patFont;
+  ImVec4 uiColors[GUI_COLOR_MAX];
+  ImVec4 volColors[128];
 
-  int curIns, curOctave;
+  int curIns, curOctave, oldRow;
 
   int arpMacroScroll;
 
@@ -36,9 +66,12 @@ class FurnaceGUI {
   int macroLoopDragLen;
   bool macroLoopDragActive;
 
+  float nextScroll;
+
   public:
     const char* noteName(short note, short octave);
     void bindEngine(DivEngine* eng);
+    void updateScroll(int amount);
     bool loop();
     bool init();
     FurnaceGUI();

src/main.cpp

@@ -231,7 +231,6 @@ int main(int argc, char** argv) {
       }
     } else {
       fileName=argv[i];
-      printf("fn: %s\n",fileName.c_str());
     }
   }
 
@@ -318,5 +317,7 @@ int main(int argc, char** argv) {
 #else
   logE("GUI requested but GUI not compiled!\n");
 #endif
+
+  e.quit();
   return 0;
 }