1 files changed, 102 insertions, 95 deletions

diff --git a/main-sdl.c b/main-sdl.c
index d31f725..3303ea8 100644
--- a/main-sdl.c
+++ b/main-sdl.c
@@ -17,6 +17,7 @@
 #include "config.h"
 #include "engine.h"
 #include "calib.h"
+#include "menu.h"
 
 /***
     Global config and status values
@@ -32,9 +33,6 @@ enum {
 
 int     g_harfe_connected = 0;
 int     g_harfe_fd = -1;
-int     g_importing_config = 0;
-ConfigSource g_config_source = source_none;
-int     g_calibration_running = 0;
 
 static char *
 find_harfe()
@@ -259,33 +257,74 @@ config_parse(char *config_file)
         g_config_source = source_file;
 }
 
-static void
-calib_fetch() {
-    int default_notes[] = { 60, 62, 64, 65, 67, 69, 71, 72, 74, 76, 77, 79, 81, 83 };
-    int i, result_count;
-    LLine *result = calib_get_results(&result_count);
+void config_save() {
+        const char *homeDir = getenv("HOME");
+        char savefile[512], date[32], confdump[512];
+        time_t t = time(NULL);
+        struct tm *tmp = localtime(&t);
+        int i, fd;
+        size_t len;
+
+        if (!homeDir) {
+            struct passwd* pwd = getpwuid(getuid());
+            if (pwd)
+                homeDir = (const char*)pwd->pw_dir;
+        }
+        strftime(date, sizeof(date), "%Y-%m-%d-%H-%M-%S", tmp);
+        snprintf( savefile, sizeof(savefile), "%s/Laserharfe-%s.cfg", homeDir, date);
+        fd = open(savefile, O_WRONLY | O_CREAT | O_TRUNC, 0644);
+
+        len = config_dumpglobals( confdump, sizeof(confdump));
+        write(fd, confdump, len );
+        for (i=0; i<g_string_count; ++i) {
+            len = config_dumpstring(i, confdump, sizeof(confdump));
+            write(fd, confdump, len );
+        }
+        close(fd);
 
-    config_reset();
-    g_string_count = result_count;
+        snprintf(savefile, sizeof(savefile), "Config saved to your home directory at %s/Laserharfe-%s.cfg", homeDir, date);
+        display_messagebox("Config saved", savefile);
 
-    g_min_y = 0; g_max_y = 1024;
+}
 
-    for (i=0; i<g_string_count; ++i) {
-        LLine *l = result + i;
+void config_import() {
+    fprintf( stderr, "import config\n" );
+    if (g_harfe_connected) {
+        config_reset();
+        g_importing_config = 1;
+        write(g_harfe_fd, "I\n", 2);
+    } else
+        display_messagebox( "Not connected", "Can't import config if Harfe is not connected.");
+}
 
-        if (l->p0.y > g_min_y)
-            g_min_y = l->p0.y;
-        if (l->p1.y < g_max_y)
-            g_max_y = l->p1.y;
+void config_export() {
+        size_t len;
+        char confdump[512];
+        int i;
+        if (!g_harfe_connected) {
+            display_messagebox( "Not connected", "Can't write config if Harfe is not connected.");
+            return;
+        }
+        if ((int)g_config_source < 2) {
+            display_messagebox( "No changes", "Config is unchanged. Won't write config to Harfe.");
+            return;
+        }
+        write(g_harfe_fd, "E\n", 2);
+        len = config_dumpglobals( confdump, sizeof(confdump));
+        write(g_harfe_fd, confdump, len );
+        for (i=0; i<g_string_count; ++i) {
+            len = config_dumpstring(i, confdump, sizeof(confdump));
+            write(g_harfe_fd, confdump, len );
+            usleep(1000);
+        }
+        write(g_harfe_fd, "-- DONE\n", 8); /* End dump marker */
+        write(g_harfe_fd, "W\n", 2); /* Remote write to SD */
+        g_config_source = source_harfe;
+}
 
-        g_string_conf[i].line       = *l;
-        g_string_conf[i].mode       = midi_three_octaves;
-        g_string_conf[i].channel    = i;
-        g_string_conf[i].note       = default_notes[i];
-        g_string_conf[i].modifier   = pitch_bend_up;
-    }
+void
+handle_keydown(SDL_Event *ev) {
 
-    g_config_source = source_edit;
 }
 
 int
@@ -351,54 +390,21 @@ main(int argc, char **argv)
                         if ( ev.key.repeat || ! g_down_pressed++)
                             engine_change_selected(-1);
 
-                    if ( ev.key.keysym.scancode == SDL_SCANCODE_S) { /* export locally */
-                        const char *homeDir = getenv("HOME");
-                        char savefile[512], date[32], confdump[512];
-                        time_t t = time(NULL);
-                        struct tm *tmp = localtime(&t);
-                        int fd;
-                        size_t len;
-
-                        if (!homeDir) {
-                            struct passwd* pwd = getpwuid(getuid());
-                            if (pwd)
-                                homeDir = (const char*)pwd->pw_dir;
-                        }
-                        strftime(date, sizeof(date), "%Y-%m-%d-%H-%M-%S", tmp);
-                        snprintf( savefile, sizeof(savefile), "%s/Laserharfe-%s.cfg", homeDir, date);
-                        fd = open(savefile, O_WRONLY | O_CREAT | O_TRUNC, 0644);
-
-                        len = config_dumpglobals( confdump, sizeof(confdump));
-                        write(fd, confdump, len );
-                        for (i=0; i<g_string_count; ++i) {
-                            len = config_dumpstring(i, confdump, sizeof(confdump));
-                            write(fd, confdump, len );
-                        }
-                        close(fd);
-                    }
+                    if ( ev.key.keysym.scancode == SDL_SCANCODE_S)
+                        config_save();
                     if (ev.key.keysym.scancode == SDL_SCANCODE_W) {
                         fprintf( stderr, "write remote config\n" );
                         write(g_harfe_fd, "W\n", 2);
                     }
-                    if (ev.key.keysym.scancode == SDL_SCANCODE_I) {
-                        fprintf( stderr, "dump config\n" );
-                        config_reset();
-                        g_importing_config = 1;
-                        write(g_harfe_fd, "I\n", 2);
-                    }
+                    if (ev.key.keysym.scancode == SDL_SCANCODE_I)
+                        config_import();
                     if (ev.key.keysym.scancode == SDL_SCANCODE_Q)
                         config_reset();
                     if (ev.key.keysym.scancode == SDL_SCANCODE_L)
                         config_parse("config_midi");
+                    if (ev.key.keysym.scancode == SDL_SCANCODE_X)
+                        config_reverse_strings();
                     if (ev.key.keysym.scancode == SDL_SCANCODE_Y) {
-                        for (i=0; i<g_string_count/2; ++i) {
-                            LLine temp = g_string_conf[i].line;
-                            g_string_conf[i].line = g_string_conf[g_string_count-i-1].line;
-                            g_string_conf[g_string_count-i-1].line = temp;
-                        }
-                        g_config_source = source_edit;
-                    }
-                    if (ev.key.keysym.scancode == SDL_SCANCODE_X) {
                         g_midi_three_octave_split_inverse ^= 1;
                         g_config_source = source_edit;
                     }
@@ -407,34 +413,34 @@ main(int argc, char **argv)
                         if (g_calibration_running)
                             calib_next(10);
 #endif
-                    if ( ev.key.keysym.scancode == SDL_SCANCODE_C) {
+                    if ( ev.key.keysym.scancode == SDL_SCANCODE_RETURN)
+                        menu_setmode(1, 1);
+                    if ( ev.key.keysym.scancode == SDL_SCANCODE_ESCAPE) {
+                        if (g_importing_config) {
+                            g_importing_config = 0;
+                            config_reset();
+                        }
+                        calib_stop();
+                        menu_setmode(6, 0);
+                    }
+                    if ( ev.key.keysym.sym == SDLK_GREATER || ev.key.keysym.scancode == SDL_SCANCODE_NONUSBACKSLASH) {
+                        menu_setmode(2,2);
+                    }
+                    if ( ev.key.keysym.scancode == SDL_SCANCODE_R) {
                         if (g_calibration_running)
-                            calib_fetch();
-                        else
                             calib_init();
-                        g_calibration_running ^= 1;
                     }
-                    if ( ev.key.keysym.scancode == SDL_SCANCODE_E) {
-                        char confdump[512];
-                        if (!g_harfe_connected) {
-                            display_messagebox( "Not connected", "Can't write config if Harfe is not connected.");
-                            break;
-                        }
-                        if ((int)g_config_source < 2) {
-                            display_messagebox( "No changes", "Config is unchanged. Won't write config to Harfe.");
-                            break;
-                        }
-                        write(g_harfe_fd, "E\n", 2);
-                        size_t len = config_dumpglobals( confdump, sizeof(confdump));
-                        write(g_harfe_fd, confdump, len );
-                        for (i=0; i<g_string_count; ++i) {
-                            len = config_dumpstring(i, confdump, sizeof(confdump));
-                            write(g_harfe_fd, confdump, len );
+                    if ( ev.key.keysym.scancode == SDL_SCANCODE_C) {
+                        if (g_calibration_running) {
+                            calib_fetch();
+                            menu_setmode(1<<3, 0);
+                        } else {
+                            calib_init();
+                            menu_setmode(0, 3);
                         }
-                        write(g_harfe_fd, "-- DONE\n", 8); /* End dump marker */
-                        write(g_harfe_fd, "W\n", 2); /* Remote write to SD */
-                        g_config_source = source_harfe;
                     }
+                    if ( ev.key.keysym.scancode == SDL_SCANCODE_E)
+                        config_export();
                     if ( ev.key.keysym.scancode == SDL_SCANCODE_M) {
                         fprintf( stderr, "MIDIing on %d\n", g_harfe_fd );
                         if (g_harfe_connected && (g_harfe_fd != -1))
@@ -449,18 +455,19 @@ main(int argc, char **argv)
                     }
                     break;
                 case SDL_MOUSEBUTTONDOWN:
-/*
-        if ( ( g_last_mouse_event / 1000 ) != ( engine_now( ) / 1000 ) || ev.button.x != last_click_x || ev.button.y != last_click_y )
-          engine_process_mouse( ev.button.x, ev.button.y );
-        last_click_x = ev.button.x;
-        last_click_y = ev.button.y;
-        last_mouse_event = engine_now( );
-*/
                         {
                             LPoint p = { display_scale_screen_to_harfe(ev.button.x), 768 - display_scale_screen_to_harfe(ev.button.y) };
-                            engine_handle_point(&p, now());
+                            if (menu_test_mouse_down(ev.button.x, ev.button.y))
+                                    engine_handle_point(&p, now());
                         }
                         break;
+                case SDL_MOUSEBUTTONUP:
+                        {
+                            LPoint p = { display_scale_screen_to_harfe(ev.button.x), 768 - display_scale_screen_to_harfe(ev.button.y) };
+                            menu_handle_button_up(ev.button.x, ev.button.y);
+                        }
+
+                        break;
                 case SDL_DROPFILE: {
                         char t[512];
                         int ret;
@@ -476,7 +483,7 @@ main(int argc, char **argv)
                     engine_checksilence(now());
 
                 runtime = now();
-                if (runtime - g_lastredraw > 30 && !g_importing_config) {
+                if (runtime - g_lastredraw > 30) {
                         g_lastredraw = runtime;
 
                         if (!g_calibration_running)