correct issues with percent signs in text

fix spacing on about page
add keys to about page
2023-09-14 16:48:58 -05:00 · 2023-09-14 16:34:04 -05:00 · 2023-09-14 16:33:16 -05:00 · 2023-09-14 16:33:01 -05:00 · 2023-09-14 13:19:03 -05:00 · 2023-09-14 12:57:23 -05:00
2 changed files with 477 additions and 355 deletions
--- a/src/main.cpp
+++ b/src/main.cpp
@ -2,6 +2,7 @@
 #include <iostream>
 #include <cstdlib>
 #include <stdio.h>
+#include <stdlib.h>
 #include <map>

 #include <alsa/asoundlib.h>
@ -17,6 +18,10 @@ static char *note_name[] = { "C ", "C#", "D ", "D#", "E ", "F ", "F#", "G ", "G#
 static char* pages[] = { "[1] Info", "[2] Pattern", "[3] Channel Bars", "[4] Piano Roll", "[5] About" };
 static char* device = "default";

+char* file;
+bool colorMode = 0; // 0 - Auto, 1 - Monochrome, 2 - 8-bit, 3 - Full
+int mtype = XMP_MODE_AUTO;
+int smix = 70;
 int display = 0;
 int mode = 0;
 int vol;
@ -27,15 +32,90 @@ int vOffset = 0;
 int looped = 0;
 bool stopped;
 bool loop;
-std::map<int, char> effects;
-
-WINDOW *dis;
-WINDOW *tab;
+std::map<int, char> efxtable;
+std::map<int, bool> efxmemtable;

 int main(int argc, char *argv[]) {
-    int err;
-    snd_pcm_t *handle;
-	snd_pcm_sframes_t frames;
+	printf("TRAKKER %s (using XMP %s)\n", TRAKKER_VERSION, xmp_version);
+	for (int a = 1; a < argc; ++a) {
+		if (strcmp(argv[a], "-h") == 0) {
+			printf("\n");
+			printf("Help\n");
+			printf("-h                Show this message.\n");
+			printf("-d <num>          Start on the specified panel.\n");
+			printf("-c <num>          Force terminal color mode.\n");
+			printf("  0                 Auto (default)\n");
+			printf("  1                 Monochrome\n");
+			printf("  2                 8bit\n");
+			printf("  3                 Full\n");
+			printf("-s <num>          Stereo Seperation\n");
+			printf("-t <type>         Set module emulation type.\n");
+			printf("  auto              Autodetect mode (default)\n");
+			printf("  mod               Play as a generic MOD player\n");
+			printf("  noisetracker      Play using Noisetracker quirks\n");
+			printf("  protracker        Play using Protracker 1/2 quirks\n");
+			printf("  s3m               Play as a generic S3M player\n");
+			printf("  st3               Play using ST3 bug emulation\n");
+			printf("  st3gus            Play using ST3+GUS quirks\n");
+			printf("  xm                Play as a generic XM player\n");
+			printf("  ft2               Play using FT2 bug emulation\n");
+			printf("  it                Play using IT quirks\n");
+			printf("  itsmp             Play using IT sample mode quirks\n");
+			exit(0);
+		} else if (strcmp(argv[a], "-d") == 0) {
+			int newdisplay = atoi(argv[a+1])-1;
+			if (newdisplay > 4 || newdisplay < 0)
+				fprintf(stderr, "Display argument is invalid.\n");
+			else {
+				printf("Setting display to \"%s\"\n", pages[newdisplay]);
+				display = newdisplay;
+			}
+			a++;
+		} else if (strcmp(argv[a], "-c") == 0) {
+			colorMode = atoi(argv[a+1]);
+			a++;
+		} else if (strcmp(argv[a], "-s") == 0) {
+			int newmix = atoi(argv[a+1]);
+			if (newmix > 100 || newmix < 0)
+				fprintf(stderr, "Stero seperation argument is invalid.\n");
+			else {
+				printf("Setting Stero seperation to %i%%\n", newmix);
+				smix = newmix;
+			}
+			a++;
+		} else if (strcmp(argv[a], "-t") == 0) {
+			char* newmode = argv[a+1];
+			if (strcmp(newmode, "mod") == 0) {
+				mtype = XMP_MODE_MOD;
+			} else if (strcmp(newmode, "noisetracker") == 0) {
+				mtype = XMP_MODE_NOISETRACKER;
+			} else if (strcmp(newmode, "protracker") == 0) {
+				mtype = XMP_MODE_PROTRACKER;
+			} else if (strcmp(newmode, "s3m") == 0) {
+				mtype = XMP_MODE_S3M;
+			} else if (strcmp(newmode, "st3") == 0) {
+				mtype = XMP_MODE_ST3;
+			} else if (strcmp(newmode, "st3gus") == 0) {
+				mtype = XMP_MODE_ST3GUS;
+			} else if (strcmp(newmode, "xm") == 0) {
+				mtype = XMP_MODE_XM;
+			} else if (strcmp(newmode, "ft2") == 0) {
+				mtype = XMP_MODE_FT2;
+			} else if (strcmp(newmode, "it") == 0) {
+				mtype = XMP_MODE_IT;
+			} else if (strcmp(newmode, "itsmp") == 0) {
+				mtype = XMP_MODE_ITSMP;
+			}
+			a++;
+		} else if (!file) {
+			file = argv[a];
+		} else {
+			fprintf(stderr, "Unknown argument: %s\n", argv[a]);
+			exit(EXIT_FAILURE);
+		}
+	}
+	
+	int err;
 	if ((err = snd_pcm_open(&handle, device, SND_PCM_STREAM_PLAYBACK, 0)) < 0) {
 		fprintf(stderr, "Playback open error: %s\n", snd_strerror(err));
 		exit(EXIT_FAILURE);
@ -46,78 +126,84 @@ int main(int argc, char *argv[]) {
 	}
 	printf("%s initialized.\n", "ALSA");
 	
-	xmp_context xc;
 	xc = xmp_create_context();
-	if (xmp_load_module(xc, argv[1]) != 0) {
-		fprintf(stderr, "Failed to load Module: %s\n", argv[1]);
+	if (xmp_load_module(xc, file) != 0) {
+		fprintf(stderr, "Failed to load Module: %s\n", file);
 		exit(EXIT_FAILURE);
-	} else printf("Loaded Module: \"%s\"\n", argv[1]);
+	} else printf("Loaded Module: \"%s\"\n", file);
 	
 	struct xmp_module_info xmi;
 	struct xmp_frame_info xfi;
 	
 	initscr();
 	
+	start_color();
+	if (colorMode == 1) goto colorless;
+	else if (colorMode == 2) goto color_8;
+	else if (colorMode == 3) goto color_full;
+	
 	if (has_colors() == TRUE) {
-		start_color();
 		if (can_change_color() == TRUE) {	
-	   		// Primary Background
-	   		init_pair(1, COLOR_BLACK, 8);
-	   		// Inactive Section
-	   		init_pair(2, 8, 7);
-	   		// Active Section
-	   		init_pair(3, 0, 12);
-	   		// Display
-	   		init_pair(4, 7, COLOR_BLACK);
-	   		// Display Row#
-	   		init_pair(5, 3, COLOR_BLACK);
-	   		// Display Playhead
-	   		init_pair(6, COLOR_WHITE, COLOR_BLUE);
-	   		// Display Playhead Row#
-	   		init_pair(7, COLOR_YELLOW, COLOR_BLUE);
-	   		// Display Stopped Playhead
-	   		init_pair(8, COLOR_WHITE, COLOR_RED);
-	   		// Display Stopped Playhead Row#
-	   		init_pair(9, COLOR_YELLOW, COLOR_RED);
-		} else {
+			color_full:
 			// Primary Background
-	   		init_pair(1, COLOR_BLACK, 8);
-	   		// Inactive Section
-	   		init_pair(2, COLOR_BLACK, COLOR_WHITE);
-	   		// Active Section
-	   		init_pair(3, COLOR_BLACK, COLOR_CYAN);
-	   		// Display
-	   		init_pair(4, COLOR_WHITE, COLOR_BLACK);
-	   		// Display Row#
-	   		init_pair(5, COLOR_YELLOW, COLOR_BLACK);
-	   		// Display Playhead
-	   		init_pair(6, COLOR_WHITE, COLOR_BLUE);
-	   		// Display Playhead Row#
-	   		init_pair(7, COLOR_YELLOW, COLOR_BLUE);
-	   		// Display Stopped Playhead
-	   		init_pair(8, COLOR_WHITE, COLOR_RED);
-	   		// Display Stopped Playhead Row#
-	   		init_pair(9, COLOR_YELLOW, COLOR_RED);
+			init_pair(1, COLOR_BLACK, 8);
+			// Inactive Section
+			init_pair(2, 8, 7);
+			// Active Section
+			init_pair(3, 0, 12);
+			// Display
+			init_pair(4, 7, COLOR_BLACK);
+			// Display Row#
+			init_pair(5, 3, COLOR_BLACK);
+			// Display Playhead
+			init_pair(6, COLOR_WHITE, COLOR_BLUE);
+			// Display Playhead Row#
+			init_pair(7, COLOR_YELLOW, COLOR_BLUE);
+			// Display Stopped Playhead
+			init_pair(8, COLOR_WHITE, COLOR_RED);
+			// Display Stopped Playhead Row#
+			init_pair(9, COLOR_YELLOW, COLOR_RED);
+		} else {
+			color_8:
+			// Primary Background
+			init_pair(1, COLOR_BLACK, 8);
+			// Inactive Section
+			init_pair(2, COLOR_BLACK, COLOR_WHITE);
+			// Active Section
+			init_pair(3, COLOR_BLACK, COLOR_CYAN);
+			// Display
+			init_pair(4, COLOR_WHITE, COLOR_BLACK);
+			// Display Row#
+			init_pair(5, COLOR_YELLOW, COLOR_BLACK);
+			// Display Playhead
+			init_pair(6, COLOR_WHITE, COLOR_BLUE);
+			// Display Playhead Row#
+			init_pair(7, COLOR_YELLOW, COLOR_BLUE);
+			// Display Stopped Playhead
+			init_pair(8, COLOR_WHITE, COLOR_RED);
+			// Display Stopped Playhead Row#
+			init_pair(9, COLOR_YELLOW, COLOR_RED);
 		}
 	} else {
-	    // Primary Background
-	   init_pair(1, COLOR_BLACK, COLOR_BLACK);
-	   // Inactive Section
-	   init_pair(2, COLOR_WHITE, COLOR_BLACK);
-	   // Active Section
-	   init_pair(3, COLOR_BLACK, COLOR_WHITE);
-	   // Display
-	   init_pair(4, COLOR_WHITE, COLOR_BLACK);
-	   // Display Row#
-	   init_pair(5, COLOR_WHITE, COLOR_BLACK);
-	   // Display Playhead
-	   init_pair(6, COLOR_BLACK, COLOR_WHITE);
-	   // Display Playhead Row#
-	   init_pair(7, COLOR_BLACK, COLOR_WHITE);
-	   // Display Stopped Playhead
-	   init_pair(8, COLOR_WHITE, COLOR_BLACK);
-	   // Display Stopped Playhead Row#
-	   init_pair(9, COLOR_WHITE, COLOR_BLACK);
+		colorless:
+		// Primary Background
+		init_pair(1, COLOR_BLACK, COLOR_BLACK);
+		// Inactive Section
+		init_pair(2, COLOR_WHITE, COLOR_BLACK);
+		// Active Section
+		init_pair(3, COLOR_BLACK, COLOR_WHITE);
+		// Display
+		init_pair(4, COLOR_WHITE, COLOR_BLACK);
+		// Display Row#
+		init_pair(5, COLOR_WHITE, COLOR_BLACK);
+		// Display Playhead
+		init_pair(6, COLOR_BLACK, COLOR_WHITE);
+		// Display Playhead Row#
+		init_pair(7, COLOR_BLACK, COLOR_WHITE);
+		// Display Stopped Playhead
+		init_pair(8, COLOR_WHITE, COLOR_BLACK);
+		// Display Stopped Playhead Row#
+		init_pair(9, COLOR_WHITE, COLOR_BLACK);
 	}
 	
 	cbreak();
@ -133,20 +219,22 @@ int main(int argc, char *argv[]) {
 	int row, pos;
 	xmp_get_module_info(xc, &xmi);
 	row = pos = -1;
-	generateEffectsTable(xmi.mod);
+	generateEffectsTable(xmi.mod->type);
+	xmp_set_player(xc, XMP_PLAYER_MODE, mtype);
 	xmp_start_player(xc, SAMPLERATE, 0);
+	xmp_set_player(xc, XMP_PLAYER_MIX, smix);
 	
 	int key;
 	bool displayChanged;
-	display = 0; displayChanged = true;
+	displayChanged = true;
 	while (true) {
-	    xmp_get_frame_info(xc, &xfi);
+		xmp_get_frame_info(xc, &xfi);
 		if (xmp_play_frame(xc) != 0 && !stopped) break;
 		if (xfi.loop_count > looped && !loop) break;
-	    else looped = xfi.loop_count;
+		else looped = xfi.loop_count;
 			
-	    keys:
-	    timeout(stopped?-1:0);
+		keys:
+		timeout(stopped?-1:0);
 		if ((key = getch()) != 0) {
 			vol = xmp_get_player(xc, XMP_PLAYER_VOLUME);
 			switch (key) {
@ -171,9 +259,11 @@ int main(int argc, char *argv[]) {
 					break;
 				case KEY_PPAGE:
 					if (vOffset > vMin + LINES-6) vOffset-=(LINES-5);
+					else vOffset = vMin;
 					break;
 				case KEY_NPAGE:
-					if (vOffset < vMax - LINES-5) vOffset+=(LINES-5);
+					if (vOffset < vMax - LINES-6) vOffset+=(LINES-5);
+					else vOffset = vMax;
 					break;
 				case 10:
 					hOffset = 0;
@ -189,6 +279,14 @@ int main(int argc, char *argv[]) {
 				case ',':
 					if (vol > 0) xmp_set_player(xc, XMP_PLAYER_VOLUME, vol-=5);
 					break;
+				case '[':
+					if (smix > 0) smix-=5;
+					xmp_set_player(xc, XMP_PLAYER_MIX, smix);
+					break;
+				case ']':
+					if (smix < 100) smix+=5;
+					xmp_set_player(xc, XMP_PLAYER_MIX, smix);
+					break;
 				case 'l':
 					loop = !loop;
 					break;
@ -204,26 +302,26 @@ int main(int argc, char *argv[]) {
 			renderTrack(&xmi, &xfi);
 		}
 			
-	    if (displayChanged) {
-	    	werase(dis);
-	    	werase(tab);
-	        hOffset = 0;
+		if (displayChanged) {
+			werase(dis);
+			werase(tab);
+			hOffset = 0;
 			vOffset = 0;
-	        move(0, 0);
-	        for (int d = 0; d < sizeof(pages)/sizeof(*pages); d++) {
-	            printw(" ");
-	            chtype tpair;
-	            if (display == d) tpair = COLOR_PAIR(3);
-	            else tpair = COLOR_PAIR(2);
-	            attron(tpair);
-	            printw(" "); printw(pages[d]); printw(" ");
-	            attroff(tpair);
-	            printw(" ");
-	        }
-            mode = 0;
-            wmove(tab, 0, 0);
-            displayChanged = false;
-	    }
+			move(0, 0);
+			for (int d = 0; d < sizeof(pages)/sizeof(*pages); d++) {
+				printw(" ");
+				chtype tpair;
+				if (display == d) tpair = COLOR_PAIR(3);
+				else tpair = COLOR_PAIR(2);
+				attron(tpair);
+				printw(" "); printw(pages[d]); printw(" ");
+				attroff(tpair);
+				printw(" ");
+			}
+			mode = 0;
+			wmove(tab, 0, 0);
+			displayChanged = false;
+		}
 			
 		if (!stopped) {
 			frames = snd_pcm_bytes_to_frames(handle, xfi.buffer_size);
@ -237,8 +335,8 @@ int main(int argc, char *argv[]) {
 			}
 			if (xfi.row != row) {
 				row = xfi.row;
+				renderTrack(&xmi, &xfi);
 			}
-			renderTrack(&xmi, &xfi);
 			wrefresh(tab);
 			wrefresh(dis);
 		} else goto keys;
@ -249,7 +347,7 @@ int main(int argc, char *argv[]) {
 	endwin();
 	xmp_end_player(xc);
 	xmp_release_module(xc);
-    xmp_free_context(xc);
+	xmp_free_context(xc);
 	if ((err = snd_pcm_drain(handle)) < 0) {
 		printf("snd_pcm_drain failed: %s\n", snd_strerror(err));
 	}
@ -280,9 +378,9 @@ void createWindows() {
 void renderTrack(xmp_module_info *mi, xmp_frame_info *fi) {
 	werase(dis);
 	wclrtoeol(tab);
-	mvwprintw(tab, 0, 1, mi->mod->name);
-    mvwprintw(
-    	tab, 
+	mvwaddstr(tab, 0, 1, mi->mod->name);
+	mvwprintw(
+		tab, 
 		0, COLS-12, 
 		"%02u:%02u/%02u:%02u", 
 		((fi->time / 1000) / 60) % 60, 
@ -292,7 +390,7 @@ void renderTrack(xmp_module_info *mi, xmp_frame_info *fi) {
 	);
 	mvwprintw(tab, 1, COLS-10, "VOL: %i%%", vol);
 	mvwprintw(tab, 1, 1, "%i/%ibpm", fi->speed, fi->bpm);
-	mvwprintw(tab, LINES-2, (COLS/2)-4, "%s%s", stopped?"STOPPED":"PLAYING", loop?" [L]":"");
+	mvwprintw(tab, LINES-2, 1, "%s %s", stopped?"STOPPED":"PLAYING", loop?"[L]":"[ ]");
 	if (display == 0) {
 		renderInfo(mi, fi);
 	} else if (display == 1) {
@ -311,52 +409,62 @@ void renderTrack(xmp_module_info *mi, xmp_frame_info *fi) {

 void renderInfo(xmp_module_info *mi, xmp_frame_info *fi) {
 	wattron(dis, A_BOLD);
-	mvwprintw(dis, 1-vOffset, 1, "Format:");
-	mvwprintw(dis, 2-vOffset, 1, "Channels:");
-	mvwprintw(dis, 3-vOffset, 1, "Looping:");
-	mvwprintw(dis, 5-vOffset, 1, "Instruments:");
-	mvwprintw(dis, (7+mi->mod->ins)-vOffset, 1, "Samples:");
+	mvwaddstr(dis, 1-vOffset, 1, "Mode:");
+	mvwaddstr(dis, 2-vOffset, 1, "Format:");
+	mvwaddstr(dis, 3-vOffset, 1, "Stereo Mix:");
+	mvwaddstr(dis, 4-vOffset, 1, "Channels:");
+	mvwaddstr(dis, 6-vOffset, 1, "Instruments:");
+	mvwaddstr(dis, (8+mi->mod->ins)-vOffset, 1, "Samples:");
 	wattroff(dis, A_BOLD);
 	
-	mvwprintw(dis, 1-vOffset, 16, mi->mod->type);
-	mvwprintw(dis, 2-vOffset, 16, "%i", mi->mod->chn);
-	mvwprintw(dis, 3-vOffset, 16, loop?"YES":"NO");
-	mvwprintw(dis, 5-vOffset, 16, "%i", mi->mod->ins);
-	mvwprintw(dis, (7+mi->mod->ins)-vOffset, 16, "%i", mi->mod->smp);
+	mvwprintw(dis, 1-vOffset, 16, "%i", xmp_get_player(xc, XMP_PLAYER_MODE));
+	mvwprintw(dis, 2-vOffset, 16, mi->mod->type);
+	mvwprintw(dis, 3-vOffset, 16, "%i%%", smix);
+	mvwprintw(dis, 4-vOffset, 16, "%i", mi->mod->chn);
+	mvwprintw(dis, 6-vOffset, 16, "%i", mi->mod->ins);
+	mvwprintw(dis, (8+mi->mod->ins)-vOffset, 16, "%i", mi->mod->smp);
 	
 	for (int xi = 0; xi < mi->mod->ins; xi++) {
-		mvwprintw(dis, xi+6-vOffset, 1, "[%02X] %s", xi, mi->mod->xxi[xi].name);
+		mvwprintw(dis, xi+7-vOffset, 1, "[%02X] %s", xi, mi->mod->xxi[xi].name);
 	}
 	for (int xs = 0; xs < mi->mod->smp; xs++) {
-		mvwprintw(dis, xs+(8+mi->mod->ins)-vOffset, 1, "[%02X] %s", xs, mi->mod->xxs[xs].name);
+		mvwprintw(dis, xs+(9+mi->mod->ins)-vOffset, 1, "[%02X] %s", xs, mi->mod->xxs[xs].name);
 	}
 }

 void renderAbout() {
 	wattron(dis, A_BOLD);
-	mvwprintw(dis, 1-vOffset, 2, "========           \\\\    // \\\\   //");
-	mvwprintw(dis, 2-vOffset, 2, "   ||               ||  //   || //");
-	mvwprintw(dis, 3-vOffset, 2, "   ||                \\\\//    \\\\//");
-	mvwprintw(dis, 4-vOffset, 2, "   || //==\\\\ //===|| ||\\\\    ||\\\\   //===\\\\ //===\\\\");
-	mvwprintw(dis, 5-vOffset, 2, "   || ||    ||    |  || \\\\   || \\\\  ||===// ||");
-	mvwprintw(dis, 6-vOffset, 2, "   || ||     \\\\===|| ||  \\\\  ||  \\\\ \\\\___/  ||");
-	mvwprintw(dis, 8-vOffset, 1, "TRAKKER    v%s", TRAKKER_VERSION);
-	mvwprintw(dis, 9-vOffset, 1, "libXMP     v%s", xmp_version);
+    mvwaddstr(dis, 1-vOffset, 2, "######## ||##\\\\   //\\\\  || // || // ||### ||##\\\\");
+    mvwaddstr(dis, 2-vOffset, 2, "   ||    ||   || //  \\\\ ||//  ||//  ||    ||  ||");
+    mvwaddstr(dis, 3-vOffset, 2, "   ||    ||##//  ||##|| |#|   |#|   ||#   ||##//");
+    mvwaddstr(dis, 4-vOffset, 2, "   ||    ||\\\\    ||  || ||\\\\  ||\\\\  ||    ||\\\\  ");
+    mvwaddstr(dis, 5-vOffset, 2, "   ||    || \\\\   ||  || || \\\\ || \\\\ ||### || \\\\ ");
+    mvwaddstr(dis, 6-vOffset, 2, "=================================================");
+	mvwaddstr(dis, 8-vOffset, 1, "TRAKKER");
+	mvwaddstr(dis, 9-vOffset, 1, "libXMP");
 	
-	mvwprintw(dis, 11-vOffset, 1, "[Spacebar]");
-	mvwprintw(dis, 12-vOffset, 1, "Number Keys");
-	mvwprintw(dis, 13-vOffset, 1, "Arrow Keys");
-	mvwprintw(dis, 14-vOffset, 1, "[,] and [.]");
-	mvwprintw(dis, 15-vOffset, 1, "[Return]");
-	mvwprintw(dis, 16-vOffset, 1, "[L]");
+	mvwaddstr(dis, 11-vOffset, 1, "[Spacebar]");
+	mvwaddstr(dis, 12-vOffset, 1, "Number Keys");
+	mvwaddstr(dis, 13-vOffset, 1, "[LF] and [RT]");
+	mvwaddstr(dis, 14-vOffset, 1, "[UP] and [DN]");
+	mvwaddstr(dis, 15-vOffset, 1, "[,] and [.]");
+	mvwaddstr(dis, 16-vOffset, 1, "[Return]");
+	mvwaddstr(dis, 17-vOffset, 1, "[L]");
+	mvwaddstr(dis, 18-vOffset, 1, "[PGUP] and [PGDN]");
+	mvwaddstr(dis, 19-vOffset, 1, "[[] and []]");
 	wattroff(dis, A_BOLD);
 	
-	mvwprintw(dis, 11-vOffset, 16, "Play/Pause");
-	mvwprintw(dis, 12-vOffset, 16, "Change Tab");
-	mvwprintw(dis, 13-vOffset, 16, "Change Hori or Vert Display Offset");
-	mvwprintw(dis, 14-vOffset, 16, "Control volume");
-	mvwprintw(dis, 15-vOffset, 16, "Reset Display");
-	mvwprintw(dis, 16-vOffset, 16, "Toggle Loop");
+	mvwaddstr(dis, 8-vOffset, 20, TRAKKER_VERSION);
+	mvwaddstr(dis, 9-vOffset, 20, xmp_version);
+	mvwaddstr(dis, 11-vOffset, 20, "Play/Pause");
+	mvwaddstr(dis, 12-vOffset, 20, "Change Tab");
+	mvwaddstr(dis, 13-vOffset, 20, "Change horizontal offset.");
+	mvwaddstr(dis, 14-vOffset, 20, "Change vertical offset.");
+	mvwaddstr(dis, 15-vOffset, 20, "Control volume");
+	mvwaddstr(dis, 16-vOffset, 20, "Reset Display");
+	mvwaddstr(dis, 17-vOffset, 20, "Toggle Loop");
+	mvwaddstr(dis, 18-vOffset, 20, "Scroll vertically per page.");
+	mvwaddstr(dis, 19-vOffset, 20, "Change stereo mixing.");
 }

 void renderRows(xmp_module_info *mi, xmp_frame_info *fi) {
@ -365,7 +473,7 @@ void renderRows(xmp_module_info *mi, xmp_frame_info *fi) {
 		if (mi->mod->xxo[j] == 0xFF) continue;
 		chtype patpair = (j == fi->pos)?COLOR_PAIR(6):COLOR_PAIR(4);
 		wattron(dis, patpair);
-		mvwprintw(dis, LINES-5, (COLS/2)+(j*3)-(fi->pos*3), "%02X", mi->mod->xxo[j]);
+		mvwprintw(dis, LINES-5, (COLS/2)+(j*3)-(fi->pos*3)-3, "%02X", mi->mod->xxo[j]);
 		wattroff(dis, patpair);
 	}
 	wattroff(tab, COLOR_PAIR(5));
@ -410,7 +518,7 @@ void renderRows(xmp_module_info *mi, xmp_frame_info *fi) {
 			else snprintf(vol, 4, "...");
 				
 			char f1;
-			if ((f1 = effects[event.fxt]) != NULL) snprintf(efx, 4, "%c%02X", f1, event.fxp);
+			if ((efxmemtable[event.fxt] || event.fxp != 0) && (f1 = efxtable[event.fxt]) != NULL) snprintf(efx, 4, "%c%02X", f1, event.fxp);
 			else snprintf(efx, 4, "...");
 			sprintf(lnbuf, "|%s %s %s %s", note, ins, vol, efx);
 			for (int z = 0; z < chnsize; z++) {
@ -441,8 +549,8 @@ void renderChannels(xmp_module_info *mi, xmp_frame_info *fi) {
 		wprintw(dis, "%02X", y);
 		wattroff(dis, no_pair);
 		for (int c = 0; c < COLS - 5; c++) {
-			if (c < cvol) wprintw(dis, "#");
-			else wprintw(dis, " ");
+			if (c < cvol) waddstr(dis, "#");
+			else waddstr(dis, " ");
 		}
 	}
 }
@ -461,236 +569,243 @@ void renderInstruments(xmp_module_info *mi, xmp_frame_info *fi) {
 			int note = (cinfo.note * (COLS - 4)) / 144;
 			if (cinfo.instrument != y) continue;
 			wmove(dis, y-vOffset, note+3);
-			if (cinfo.volume >= 32) wprintw(dis, "#");
-			else if (cinfo.volume >= 16) wprintw(dis, "=");
-			else if (cinfo.volume > 0) wprintw(dis, "-");
+			if (cinfo.volume >= 32) waddstr(dis, "#");
+			else if (cinfo.volume >= 16) waddstr(dis, "=");
+			else if (cinfo.volume > 0) waddstr(dis, "-");
 		}
 		wmove(dis, y, COLS-4);
 	}
 }

-void generateEffectsTable(xmp_module *xm) {
-	if (isPartOf(xm->type, "669")) {
-		effects[96] = 'A';
-        effects[97] = 'B';
-        effects[98] = 'C';
-        effects[99] = 'D';
-        effects[100] = 'E';
-        effects[126] = 'F';
-	} else if (isPartOf(xm->type, "Farandole")) {
-		effects[249] = '1';
-        effects[248] = '2';
-        effects[122] = '3';
-        effects[251] = '4';
-        effects[254] = '5';
-        effects[4] = '6';
-        effects[256] = '7';
-        effects[252] = '8';
-        effects[123] = '9';
-        effects[250] = 'C';
-        effects[15] = 'F';
-	} else if (isPartOf(xm->type, "Imago Orpheus")) {
-		effects[1] = '1';
-        effects[2] = '2';
-        effects[3] = '3';
-        effects[4] = '4';
-        effects[5] = '5';
-        effects[6] = '6';
-        effects[7] = '7';
-        effects[8] = '8';
-        effects[9] = '9';
-        effects[10] = 'A';
-        effects[11] = 'B';
-        effects[12] = 'C';
-        effects[13] = 'D';
-        effects[14] = 'E';
-        effects[15] = 'F';
-        effects[16] = 'G';
-        effects[17] = 'H';
-        effects[18] = 'I';
-        effects[19] = 'J';
-        effects[20] = 'K';
-        effects[21] = 'L';
-        effects[22] = 'M';
-        effects[23] = 'N';
-        effects[24] = 'O';
-        effects[25] = 'P';
-        effects[26] = 'Q';
-        effects[27] = 'R';
-        effects[28] = 'S';
-        effects[29] = 'T';
-        effects[30] = 'U';
-        effects[31] = 'V';
-        effects[32] = 'W';
-        effects[33] = 'X';
-        effects[34] = 'Y';
-        effects[35] = 'Z';
-	} else if (isPartOf(xm->type, "S3M")) {
-		effects[163] = 'A';
-        effects[11] = 'B';
-        effects[13] = 'C';
-        effects[10] = 'D';
-        effects[2] = 'E';
-        effects[1] = 'F';
-        effects[3] = 'G';
-        effects[4] = 'H';
-        effects[29] = 'I';
-        effects[180] = 'J';
-        effects[6] = 'K';
-        effects[5] = 'L';
-        effects[9] = 'O';
-        effects[27] = 'Q';
-        effects[7] = 'R';
-        effects[254] = 'S';
-        effects[171] = 'T';
-        effects[172] = 'U';
-        effects[16] = 'V';
-        effects[8] = 'X';
-        effects[141] = 'X';
-        effects[14] = 'S';
-	} else if (isPartOf(xm->type, "IT")) {
-		effects[163] = 'A';
-		effects[11] = 'B';
-		effects[142] = 'C';
-		effects[10] = 'D';
-		effects[2] = 'E';
-		effects[1] = 'F';
-		effects[3] = 'G';
-		effects[4] = 'H';
-		effects[29] = 'I';
-		effects[180] = 'J';
-		effects[6] = 'K';
-		effects[5] = 'L';
-		effects[128] = 'M';
-		effects[129] = 'N';
-		effects[9] = 'O';
-		effects[137] = 'P';
-		effects[27] = 'Q';
-		effects[7] = 'R';
-		effects[254] = 'S';
-		effects[135] = 'T';
-		effects[172] = 'U';
-		effects[16] = 'V';
-		effects[17] = 'W';
-		effects[8] = 'X';
-		effects[138] = 'Y';
-		effects[141] = 'S';
-		effects[136] = 'S';
-		effects[14] = 'S';
-		effects[192] = 'c';
-		effects[193] = 'd';
-		effects[194] = 'a';
-		effects[195] = 'b';
-		effects[132] = 'S';
-		effects[139] = 'S';
-		effects[140] = 'S';
-	} else if (isPartOf(xm->type, "LIQ")) {
-		effects[0] = 'A';
-		effects[171] = 'B';
-		effects[13] = 'C';
-		effects[2] = 'D';
-		effects[172] = 'F';
-		effects[11] = 'J';
-		effects[10] = 'L';
-		effects[14] = 'M';
-		effects[3] = 'N';
-		effects[9] = 'O';
-        effects[163] = 'S';
-		effects[7] = 'T';
-		effects[1] = 'U';
-		effects[4] = 'V';
-		effects[5] = 'X';
-		effects[6] = 'Y';
-	} else if (isPartOf(xm->type, "Oktalyzer")) {
-		effects[1] = '1';
-		effects[2] = '2';
-		effects[112] = '0';
-		effects[113] = '0';
-		effects[114] = '0';
-		effects[115] = '6';
-		effects[116] = '5';
-		effects[156] = '6';
-		effects[11] = 'B';
-		effects[15] = 'F';
-        effects[157] = '5';
-		effects[12] = 'C';
-		effects[10] = 'A';
-		effects[174] = 'E';
-		effects[17] = 'E';
-		effects[0] = '0';
-	} else if (isPartOf(xm->type, "STX")) {
-		effects[15] = 'A';
-		effects[11] = 'B';
-		effects[13] = 'C';
-		effects[10] = 'D';
-		effects[2] = 'E';
-		effects[1] = 'F';
-		effects[3] = 'G';
-		effects[4] = 'H';
-		effects[29] = 'I';
-		effects[0] = 'J';
-	} else if (isPartOf(xm->type, "Funk")) {
-		effects[121] = 'A';
-		effects[120] = 'B';
-		effects[122] = 'C';
-		effects[123] = 'D';
-		effects[124] = 'G';
-		effects[125] = 'H';
-		effects[0] = 'L';
-		effects[12] = 'N';
-		effects[127] = 'O';
-		effects[14] = 'O';
-		effects[15] = 'O';
+void generateEffectsTable(char* type) {
+	if (isPartOf(type, "669")) {
+		addToEffects(96, 'A', true);
+		addToEffects(97, 'B', true);
+		addToEffects(98, 'C', true);
+		addToEffects(99, 'D', true);
+		addToEffects(100, 'E', true);
+		addToEffects(126, 'F', true);
+	} else if (isPartOf(type, "Farandole")) {
+		addToEffects(249, '1', true);
+		addToEffects(248, '2', true);
+		addToEffects(122, '3', true);
+		addToEffects(251, '4', true);
+		addToEffects(254, '5', true);
+		addToEffects(4, '6', true);
+		addToEffects(256, '7', true);
+		addToEffects(252, '8', true);
+		addToEffects(123, '9', true);
+		addToEffects(250, 'C', true);
+		addToEffects(15, 'F', true);
+	} else if (isPartOf(type, "Imago Orpheus")) {
+		addToEffects(1, '1', true);
+		addToEffects(2, '2', true);
+		addToEffects(3, '3', true);
+		addToEffects(4, '4', true);
+		addToEffects(5, '5', true);
+		addToEffects(6, '6', true);
+		addToEffects(7, '7', true);
+		addToEffects(8, '8', true);
+		addToEffects(9, '9', true);
+		addToEffects(10, 'A', true);
+		addToEffects(11, 'B', true);
+		addToEffects(12, 'C', true);
+		addToEffects(13, 'D', true);
+		addToEffects(14, 'E', true);
+		addToEffects(15, 'F', true);
+		addToEffects(16, 'G', true);
+		addToEffects(17, 'H', true);
+		addToEffects(18, 'I', true);
+		addToEffects(19, 'J', true);
+		addToEffects(20, 'K', true);
+		addToEffects(21, 'L', true);
+		addToEffects(22, 'M', true);
+		addToEffects(23, 'N', true);
+		addToEffects(24, 'O', true);
+		addToEffects(25, 'P', true);
+		addToEffects(26, 'Q', true);
+		addToEffects(27, 'R', true);
+		addToEffects(28, 'S', true);
+		addToEffects(29, 'T', true);
+		addToEffects(30, 'U', true);
+		addToEffects(31, 'V', true);
+		addToEffects(32, 'W', true);
+		addToEffects(33, 'X', true);
+		addToEffects(34, 'Y', true);
+		addToEffects(35, 'Z', true);
+	} else if (isPartOf(type, "S3M")) {
+		addToEffects(163, 'A', false);
+		addToEffects(11, 'B', true);
+		addToEffects(13, 'C', true);
+		addToEffects(10, 'D', true);
+		addToEffects(2, 'E', true);
+		addToEffects(1, 'F', true);
+		addToEffects(3, 'G', true);
+		addToEffects(4, 'H', true);
+		addToEffects(29, 'I', true);
+		addToEffects(180, 'J', true);
+		addToEffects(6, 'K', true);
+		addToEffects(5, 'L', true);
+		addToEffects(9, 'O', true);
+		addToEffects(27, 'Q', true);
+		addToEffects(7, 'R', true);
+		addToEffects(254, 'S', true);
+		addToEffects(171, 'T', false);
+		addToEffects(172, 'U', true);
+		addToEffects(16, 'V', true);
+		addToEffects(8, 'X', true);
+		addToEffects(141, 'X', true);
+		addToEffects(14, 'S', true);
+	} else if (isPartOf(type, "IT")) {
+		addToEffects(163, 'A', false);
+		addToEffects(11, 'B', true);
+		addToEffects(142, 'C', true);
+		addToEffects(10, 'D', true);
+		addToEffects(2, 'E', true);
+		addToEffects(1, 'F', true);
+		addToEffects(3, 'G', true);
+		addToEffects(4, 'H', true);
+		addToEffects(29, 'I', true);
+		addToEffects(180, 'J', true);
+		addToEffects(6, 'K', true);
+		addToEffects(5, 'L', true);
+		addToEffects(128, 'M', true);
+		addToEffects(129, 'N', true);
+		addToEffects(9, 'O', false); // OpenMPT doc states this should be true but there is zero effect at 00 (0*256=0)
+		addToEffects(137, 'P', true);
+		addToEffects(27, 'Q', true);
+		addToEffects(7, 'R', true);
+		addToEffects(254, 'S', true);
+		addToEffects(135, 'T', false);
+		addToEffects(172, 'U', true);
+		addToEffects(16, 'V', true);
+		addToEffects(17, 'W', true);
+		addToEffects(8, 'X', true);
+		addToEffects(138, 'Y', true);
+		addToEffects(141, 'S', true);
+		addToEffects(136, 'S', true);
+		addToEffects(14, 'S', true);
+		addToEffects(192, 'c', true);
+		addToEffects(193, 'd', true);
+		addToEffects(194, 'a', true);
+		addToEffects(195, 'b', true);
+		addToEffects(132, 'S', true);
+		addToEffects(139, 'S', true);
+		addToEffects(140, 'S', true);
+	} else if (isPartOf(type, "LIQ")) {
+		addToEffects(0, 'A', true);
+		addToEffects(171, 'B', true);
+		addToEffects(13, 'C', true);
+		addToEffects(2, 'D', true);
+		addToEffects(172, 'F', true);
+		addToEffects(11, 'J', true);
+		addToEffects(10, 'L', true);
+		addToEffects(14, 'M', true);
+		addToEffects(3, 'N', true);
+		addToEffects(9, 'O', true);
+		addToEffects(163, 'S', true);
+		addToEffects(7, 'T', true);
+		addToEffects(1, 'U', true);
+		addToEffects(4, 'V', true);
+		addToEffects(5, 'X', true);
+		addToEffects(6, 'Y', true);
+	} else if (isPartOf(type, "Oktalyzer")) {
+		addToEffects(1, '1', true);
+		addToEffects(2, '2', true);
+		addToEffects(112, '0', true);
+		addToEffects(113, '0', true);
+		addToEffects(114, '0', true);
+		addToEffects(115, '6', true);
+		addToEffects(116, '5', true);
+		addToEffects(156, '6', true);
+		addToEffects(11, 'B', true);
+		addToEffects(15, 'F', true);
+		addToEffects(157, '5', true);
+		addToEffects(12, 'C', true);
+		addToEffects(10, 'A', true);
+		addToEffects(174, 'E', true);
+		addToEffects(17, 'E', true);
+		addToEffects(0, '0', true);
+	} else if (isPartOf(type, "STX")) {
+		addToEffects(15, 'A', true);
+		addToEffects(11, 'B', true);
+		addToEffects(13, 'C', true);
+		addToEffects(10, 'D', true);
+		addToEffects(2, 'E', true);
+		addToEffects(1, 'F', true);
+		addToEffects(3, 'G', true);
+		addToEffects(4, 'H', true);
+		addToEffects(29, 'I', true);
+		addToEffects(0, 'J', true);
+	} else if (isPartOf(type, "Funk")) {
+		addToEffects(121, 'A', true);
+		addToEffects(120, 'B', true);
+		addToEffects(122, 'C', true);
+		addToEffects(123, 'D', true);
+		addToEffects(124, 'G', true);
+		addToEffects(125, 'H', true);
+		addToEffects(0, 'L', true);
+		addToEffects(12, 'N', true);
+		addToEffects(127, 'O', true);
+		addToEffects(14, 'O', true);
+		addToEffects(15, 'O', true);
 	} else {
-		effects[0] = '0';
-		effects[1] = '1';
-		effects[2] = '2';
-		effects[3] = '3';
-		effects[4] = '4';
-		effects[5] = '5';
-		effects[6] = '6';
-		effects[7] = '7';
-		effects[8] = '8';
-		effects[9] = '9';
-		effects[10] = 'A';
-		effects[11] = 'B';
-		effects[12] = 'C';
-		effects[13] = 'D';
-		effects[14] = 'E';
-		effects[15] = 'F';
-        effects[16] = 'G';
-		effects[27] = 'Q';
-		effects[181] = 'P';
-		effects[17] = 'H';
-		effects[21] = 'L';
-		effects[164] = 'c';
-		effects[33] = 'X';
-		effects[20] = 'K';
-		effects[25] = 'P';
-		effects[29] = 'T';
-		effects[146] = '4';
-		effects[160] = 'x';
-		effects[161] = 'x';
-		effects[171] = 'F';
+		addToEffects(0, '0', false);
+		addToEffects(1, '1', false);
+		addToEffects(2, '2', false);
+		addToEffects(3, '3', true);
+		addToEffects(4, '4', true);
+		addToEffects(5, '5', false);
+		addToEffects(6, '6', false);
+		addToEffects(7, '7', true);
+		addToEffects(8, '8', true);
+		addToEffects(9, '9', true);
+		addToEffects(10, 'A', false);
+		addToEffects(11, 'B', true);
+		addToEffects(12, 'C', true);
+		addToEffects(13, 'D', true);
+		addToEffects(14, 'E', false);
+		addToEffects(15, 'F', true);
+		addToEffects(16, 'G', true);
+		addToEffects(27, 'Q', true);
+		addToEffects(181, 'P', true);
+		addToEffects(17, 'H', true);
+		addToEffects(21, 'L', true);
+		addToEffects(164, 'c', true);
+		addToEffects(33, 'X', true);
+		addToEffects(20, 'K', true);
+		addToEffects(25, 'P', true);
+		addToEffects(29, 'T', true);
+		addToEffects(146, '4', true);
+		addToEffects(160, 'x', true);
+		addToEffects(161, 'x', true);
+		addToEffects(171, 'F', true);
 	}
 }

+// We do not care for previous effects (memory = true) because it's a tracker.
+// 'mem' is only for discarding zero values.
+void addToEffects(int id, char efx, bool mem) {
+	efxtable[id] = efx;
+	efxmemtable[id] = mem;
+}
+
 bool isPartOf(char* w1, char* w2) {
 	int i=0;
 	int j=0;
 	while(w1[i]!='\0'){
-    	if(w1[i] == w2[j]) {
-        	int init = i;
-        	while (w1[i] == w2[j] && w2[j]!='\0') {
-            	j++;
-            	i++;
-        	}
-        	if(w2[j]=='\0') {
-            	return true;
-        	}
-        	j=0;
-    	}
-    	i++;
+		if(w1[i] == w2[j]) {
+			int init = i;
+			while (w1[i] == w2[j] && w2[j]!='\0') {
+				j++;
+				i++;
+			}
+			if(w2[j]=='\0') {
+				return true;
+			}
+			j=0;
+		}
+		i++;
 	}
 	return false;
 }
--- a/src/trakker.h
+++ b/src/trakker.h
@ -1,6 +1,12 @@
 #ifndef TRAKKER_H
 #define TRAKKER_H

+xmp_context xc;
+snd_pcm_t *handle;
+snd_pcm_sframes_t frames;
+WINDOW *dis;
+WINDOW *tab;
+
 void destroyWindows();
 void createWindows();
 void renderInfo(xmp_module_info *mi, xmp_frame_info *fi);
@ -9,7 +15,8 @@ void renderTrack(xmp_module_info *mi, xmp_frame_info *fi);
 void renderRows(xmp_module_info *mi, xmp_frame_info *fi);
 void renderChannels(xmp_module_info *mi, xmp_frame_info *fi);
 void renderInstruments(xmp_module_info *mi, xmp_frame_info *fi);
-void generateEffectsTable(xmp_module *xm);
+void generateEffectsTable(char* type);
+void addToEffects(int id, char efx, bool mem);
 bool isPartOf(char* w1, char* w2);

 #endif
Author	SHA1	Message	Date
Wirlaburla	c82038a618	correct issues with percent signs in text	2023-09-14 16:48:58 -05:00
Wirlaburla	652fe8a527	fix spacing on about page	2023-09-14 16:34:04 -05:00
Wirlaburla	483a9d9287	add keys to about page	2023-09-14 16:33:16 -05:00
Wirlaburla	b18bfa4ddd	add argument support	2023-09-14 16:33:01 -05:00
Wirlaburla	3122b31405	correct positioning of pattern	2023-09-14 13:19:03 -05:00
Wirlaburla	77884d97ff	fix About logo since I screwed it up	2023-09-14 12:57:23 -05:00
Wirlaburla	960fa3fc23	only re-render if current row has changed	2023-09-14 12:48:10 -05:00
Wirlaburla	1135ad8993	fix the tabs vs spaces problem	2023-09-14 12:45:46 -05:00
Wirlaburla	5b4cb88dc0	Add false memory for effects (fixes xm/mod and it's empty 0 efx)	2023-09-14 12:40:28 -05:00
Wirlaburla	5af741d9fb	Fix Page buttons and optimized effects table	2023-09-14 12:24:25 -05:00