otomatalabs/furnace
7
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

GUI: implement a few more actions

Browse source 
two more and we have custom keybinds!
This commit is contained in:
tildearrow 2022-02-12 02:42:47 -05:00
parent ec3a8e93ed
commit 2c0de32fa3
2 changed files with 86 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

92
src/gui/gui.cpp
View file

@ -5236,30 +5236,36 @@ void FurnaceGUI::moveCursorNextChannel(bool overflow) {
selEnd=cursor; selEnd=cursor;
} }
void FurnaceGUI::moveCursorTop() { void FurnaceGUI::moveCursorTop(bool select) {
finishSelection(); finishSelection();
curNibble=false; curNibble=false;
if (cursor.y==0) { if (cursor.y==0) {
cursor.xCoarse=0; DETERMINE_FIRST;
cursor.xCoarse=firstChannel;
cursor.xFine=0; cursor.xFine=0;
} else { } else {
cursor.y=0; cursor.y=0;
} }
selStart=cursor; selStart=cursor;
if (!select) {
selEnd=cursor; selEnd=cursor;
}
updateScroll(cursor.y); updateScroll(cursor.y);
} }
void FurnaceGUI::moveCursorBottom() { void FurnaceGUI::moveCursorBottom(bool select) {
finishSelection(); finishSelection();
curNibble=false; curNibble=false;
if (cursor.y==e->song.patLen-1) { if (cursor.y==e->song.patLen-1) {
cursor.xCoarse=e->getTotalChannelCount()-1; DETERMINE_LAST;
cursor.xCoarse=lastChannel-1;
cursor.xFine=2+e->song.pat[cursor.xCoarse].effectRows*2; cursor.xFine=2+e->song.pat[cursor.xCoarse].effectRows*2;
} else { } else {
cursor.y=e->song.patLen-1; cursor.y=e->song.patLen-1;
} }
if (!select) {
selStart=cursor; selStart=cursor;
}
selEnd=cursor; selEnd=cursor;
updateScroll(cursor.y); updateScroll(cursor.y);
} }
@ -6010,7 +6016,74 @@ void FurnaceGUI::doAction(int what) {
collapseWindow=true; collapseWindow=true;
break; break;
case GUI_ACTION_CLOSE_WINDOW: case GUI_ACTION_CLOSE_WINDOW:
closeWindow=true; switch (curWindow) {
case GUI_WINDOW_EDIT_CONTROLS:
editControlsOpen=false;
break;
case GUI_WINDOW_SONG_INFO:
songInfoOpen=false;
break;
case GUI_WINDOW_ORDERS:
ordersOpen=false;
break;
case GUI_WINDOW_INS_LIST:
insListOpen=false;
break;
case GUI_WINDOW_PATTERN:
patternOpen=false;
break;
case GUI_WINDOW_INS_EDIT:
insEditOpen=false;
break;
case GUI_WINDOW_WAVE_LIST:
waveListOpen=false;
break;
case GUI_WINDOW_WAVE_EDIT:
waveEditOpen=false;
break;
case GUI_WINDOW_SAMPLE_LIST:
sampleListOpen=false;
break;
case GUI_WINDOW_SAMPLE_EDIT:
sampleEditOpen=false;
break;
case GUI_WINDOW_MIXER:
mixerOpen=false;
break;
case GUI_WINDOW_ABOUT:
aboutOpen=false;
break;
case GUI_WINDOW_SETTINGS:
settingsOpen=false;
break;
case GUI_WINDOW_DEBUG:
debugOpen=false;
break;
case GUI_WINDOW_OSCILLOSCOPE:
oscOpen=false;
break;
case GUI_WINDOW_VOL_METER:
volMeterOpen=false;
break;
case GUI_WINDOW_STATS:
statsOpen=false;
break;
case GUI_WINDOW_COMPAT_FLAGS:
compatFlagsOpen=false;
break;
case GUI_WINDOW_PIANO:
pianoOpen=false;
break;
case GUI_WINDOW_NOTES:
notesOpen=false;
break;
case GUI_WINDOW_CHANNELS:
channelsOpen=false;
break;
default:
break;
}
curWindow=GUI_WINDOW_NOTHING;
break; break;
case GUI_ACTION_PAT_NOTE_UP: case GUI_ACTION_PAT_NOTE_UP:
@ -6068,10 +6141,10 @@ void FurnaceGUI::doAction(int what) {
moveCursorPrevChannel(true); moveCursorPrevChannel(true);
break; break;
case GUI_ACTION_PAT_CURSOR_BEGIN: case GUI_ACTION_PAT_CURSOR_BEGIN:
moveCursorTop(); moveCursorTop(false);
break; break;
case GUI_ACTION_PAT_CURSOR_END: case GUI_ACTION_PAT_CURSOR_END:
moveCursorBottom(); moveCursorBottom(false);
break; break;
case GUI_ACTION_PAT_CURSOR_UP_COARSE: case GUI_ACTION_PAT_CURSOR_UP_COARSE:
moveCursor(0,-16,false); moveCursor(0,-16,false);
@ -6098,10 +6171,10 @@ void FurnaceGUI::doAction(int what) {
moveCursor(0,1,true); moveCursor(0,1,true);
break; break;
case GUI_ACTION_PAT_SELECTION_BEGIN: case GUI_ACTION_PAT_SELECTION_BEGIN:
//moveCursorTop(); moveCursorTop(true);
break; break;
case GUI_ACTION_PAT_SELECTION_END: case GUI_ACTION_PAT_SELECTION_END:
//moveCursorBottom(); moveCursorBottom(true);
break; break;
case GUI_ACTION_PAT_SELECTION_UP_COARSE: case GUI_ACTION_PAT_SELECTION_UP_COARSE:
moveCursor(0,-16,true); moveCursor(0,-16,true);
@ -6426,7 +6499,6 @@ void FurnaceGUI::keyDown(SDL_Event& ev) {
try { try {
int action=actionMapPat.at(mapped); int action=actionMapPat.at(mapped);
if (action>0) { if (action>0) {
printf("action %d\n",action);
doAction(action); doAction(action);
return; return;
} }

4
src/gui/gui.h
View file

@ -584,8 +584,8 @@ class FurnaceGUI {
void moveCursor(int x, int y, bool select); void moveCursor(int x, int y, bool select);
void moveCursorPrevChannel(bool overflow); void moveCursorPrevChannel(bool overflow);
void moveCursorNextChannel(bool overflow); void moveCursorNextChannel(bool overflow);
void moveCursorTop(); void moveCursorTop(bool select);
void moveCursorBottom(); void moveCursorBottom(bool select);
void editAdvance(); void editAdvance();
void prepareUndo(ActionType action); void prepareUndo(ActionType action);
void makeUndo(ActionType action); void makeUndo(ActionType action);