From b9802b744654ca13510270cd6c4d845a233e0a12 Mon Sep 17 00:00:00 2001 From: erdgeist Date: Sun, 9 Apr 2017 22:09:01 +0200 Subject: Add more commands for config edit --- main-sdl.c | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/main-sdl.c b/main-sdl.c index 6bc3970..6014198 100644 --- a/main-sdl.c +++ b/main-sdl.c @@ -52,12 +52,12 @@ find_harfe() while ((dp = readdir(dev)) != NULL) { size_t len = dp->d_namlen; char *name = dp->d_name; - int i, tail = 3; + int i; if (len < 6 || name[0] != 'c' || name[1] != 'u' || name[2] != '.') continue; - for (i = 0; i < len - tail; ++i) + for (i = 0; i < len - 3; ++i) if (name[i] == 'H' && name[i + 1] == 'A' && name[i + 2] == 'R' ) { if ((harfe = calloc(1, 5 + len + 1))) { sprintf(harfe, "/dev/"); @@ -313,6 +313,7 @@ main(int argc, char **argv) L - Load config from local default (config_midi) Y - Invert String order + X - Invert Octave order Q - Reset local Config C - Start calibration @@ -330,16 +331,6 @@ main(int argc, char **argv) if (ev.key.keysym.scancode == SDL_SCANCODE_DOWN) g_down_pressed = 0; break; case SDL_KEYDOWN: -/* - if ( ev.key.keysym.sym >= SDLK_1 && ev.key.keysym.sym <= SDLK_9 ) - engine_select_string( ev.key.keysym.sym - SDLK_1 ); - if ( ev.key.keysym.sym == SDLK_BACKSPACE || ev.key.keysym.sym == SDLK_DELETE ) - engine_delete_selected_string( ); - if ( ev.key.keysym.sym == SDLK_d ) { - g_stringsdescending = 1 - g_stringsdescending; - printf( "String order (left to right) is now %sscending.\n", g_stringsdescending ? "de" : "a" ); - } -*/ if ( ev.key.keysym.scancode == SDL_SCANCODE_0) engine_select_config(sel_none); if ( ev.key.keysym.scancode == SDL_SCANCODE_1) @@ -349,14 +340,16 @@ main(int argc, char **argv) if ( ev.key.keysym.scancode == SDL_SCANCODE_3) engine_select_config(sel_2_oct); if ( ev.key.keysym.scancode == SDL_SCANCODE_4) - engine_select_config(sel_3_oct_top); - if ( ev.key.keysym.scancode == SDL_SCANCODE_5) engine_select_config(sel_3_oct_bottom); + if ( ev.key.keysym.scancode == SDL_SCANCODE_5) + engine_select_config(sel_3_oct_top); - if ( ev.key.keysym.scancode == SDL_SCANCODE_UP && ! g_up_pressed++) - engine_change_selected(1); - if ( ev.key.keysym.scancode == SDL_SCANCODE_DOWN && ! g_down_pressed++) - engine_change_selected(-1); + if ( ev.key.keysym.scancode == SDL_SCANCODE_UP) + if ( ev.key.repeat || ! g_up_pressed++) + engine_change_selected(1); + if ( ev.key.keysym.scancode == SDL_SCANCODE_DOWN) + 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"); @@ -419,7 +412,7 @@ main(int argc, char **argv) calib_fetch(); else calib_init(); - g_calibration_running = 1 - g_calibration_running; + g_calibration_running ^= 1; } if ( ev.key.keysym.scancode == SDL_SCANCODE_E) { char confdump[512]; @@ -461,7 +454,7 @@ main(int argc, char **argv) engine_handle_point(&p, now()); } break; - case SDL_DROPFILE: { // In case if dropped file + case SDL_DROPFILE: { char t[512]; int ret; snprintf( t, sizeof(t), "Do you want to import config file %s?\n", ev.drop.file); -- cgit v1.2.3