From 3881a7dd9757f5640be3a6ab4c6bbfff5c0b7fd2 Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Wed, 13 Jun 2018 00:00:01 +0200
Subject: [PATCH] more cleanup with uniformizing the keys for 'back' and 'help'

---
 config.cpp    | 54 ++++++++++++++++++++++++---------------------------
 conformal.cpp |  2 +-
 debug.cpp     |  2 +-
 dialogs.cpp   | 12 ++++++++++--
 geom-exp.cpp  |  8 ++++----
 goldberg.cpp  |  4 ++--
 hyper.h       |  3 +++
 hyperweb.cpp  |  2 +-
 menus.cpp     | 10 +++++-----
 netgen.cpp    |  2 +-
 pattern2.cpp  |  2 +-
 rogueviz.cpp  |  2 +-
 rug.cpp       |  2 +-
 scores.cpp    |  2 +-
 shmup.cpp     |  4 ++--
 textures.cpp  |  6 +++---
 tour.cpp      |  2 +-
 yendor.cpp    |  8 ++++++--
 18 files changed, 69 insertions(+), 58 deletions(-)

diff --git a/config.cpp b/config.cpp
index ee347959..ae4df0f6 100644
--- a/config.cpp
+++ b/config.cpp
@@ -554,7 +554,7 @@ void loadConfig() {
 
 void showAllConfig() {
   dialog::addBreak(50);
-  dialog::addItem(XLAT("go back"), ' ');
+  dialog::addBack();
 #if CAP_CONFIG
   dialog::addItem(XLAT("save the current config"), 's');
   if(getcstat == 's')
@@ -565,8 +565,7 @@ void showAllConfig() {
 void handleAllConfig(int sym, int uni) {
   if(sym == SDLK_F1 || uni == 'h') gotoHelp(help);
 
-  else if(uni == ' ') popScreen();
-  else if(sym == SDLK_ESCAPE) popScreen();
+  else if(uni == ' ' || sym == SDLK_ESCAPE) popScreen();
 #if CAP_CONFIG
   else if(uni == 's') saveConfig();
 #endif  
@@ -908,20 +907,19 @@ void showJoyConfig() {
   dialog::addSelItem(XLAT("second joystick: panning speed"), fts(vid.joypanspeed * 1000), 'd');
 
   dialog::addBreak(50);
-  dialog::addItem(XLAT("go back"), ' ');
+  dialog::addBack();
   dialog::display();
   
   keyhandler = [] (int sym, int uni) {
     dialog::handleNavigation(sym, uni);
-    char xuni = uni | 32;
-    if(xuni == 'p') autojoy = !autojoy;
-    else if(xuni == 'a') 
+    if(uni == 'p') autojoy = !autojoy;
+    else if(uni == 'a') 
       dialog::editNumber(vid.joyvalue, 0, 32768, 100, 4800, XLAT("first joystick: movement threshold"), "");
-    else if(xuni == 'b') 
+    else if(uni == 'b') 
       dialog::editNumber(vid.joyvalue2, 0, 32768, 100, 5600, XLAT("first joystick: execute movement threshold"), "");
-    else if(xuni == 'c')
+    else if(uni == 'c')
       dialog::editNumber(vid.joypanthreshold, 0, 32768, 100, 2500, XLAT("second joystick: pan threshold"), "");
-    else if(xuni == 'd') 
+    else if(uni == 'd') 
       dialog::editNumber(vid.joypanspeed, 0, 1e-2, 1e-5, 1e-4, XLAT("second joystick: panning speed"), "");
   
     else if(doexiton(sym, uni)) popScreen();
@@ -1047,7 +1045,7 @@ void showStereo() {
 
   dialog::addSelItem(XLAT("field of view"), fts(stereo::fov) + "°", 'f');
 
-  dialog::addItem(XLAT("back"), 'v');
+  dialog::addBack();
   dialog::display();
 
   keyhandler = [] (int sym, int uni) {
@@ -1146,7 +1144,7 @@ void show3D() {
     dialog::addInfo(XLAT("parameters set correctly"));
   dialog::addBreak(50);
   dialog::addItem(XLAT("stereo vision config"), 'e');
-  dialog::addItem(XLAT("go back"), ' ');
+  dialog::addBack();
   dialog::display();
   
   keyhandler = [] (int sym, int uni) {
@@ -1235,7 +1233,7 @@ void showCustomizeChar() {
   if(numplayers() > 1) dialog::addSelItem(XLAT("player"), its(shmup::cpid+1), 'a');
   
   dialog::addBreak(50);
-  dialog::addItem(XLAT("go back"), ' ');
+  dialog::addBack();
   dialog::display();
   
   int firsty = dialog::items[0].position / 2;
@@ -1250,25 +1248,24 @@ void showCustomizeChar() {
   
   keyhandler = [] (int sym, int uni) {
     dialog::handleNavigation(sym, uni);
-    char xuni = uni | 32;
   
     if(shmup::on || multi::players) shmup::cpid = shmup::cpid_edit % shmup::players;
     charstyle& cs = getcs();
-    if(xuni == 'a') { shmup::cpid_edit++; shmup::cpid_edit %= 60; }
-    if(xuni == 'g') {
+    bool cat = cs.charid >= 4;
+    if(uni == 'a') { shmup::cpid_edit++; shmup::cpid_edit %= 60; }
+    else if(uni == 'g') {
       cs.charid++;
       if(cs.charid == 2 && !princess::everSaved && !autocheat) cs.charid = 4;
       cs.charid %= 10;
       }
-    if(xuni == 'p') vid.samegender = !vid.samegender;
-    bool cat = cs.charid >= 4;
-    if(xuni == 's') switchcolor(cs.skincolor, cat ? haircolors : skincolors);
-    if(xuni == 'h') switchcolor(cs.haircolor, haircolors);
-    if(xuni == 'w') switchcolor(cs.swordcolor, cat ? eyecolors : swordcolors);
-    if(xuni == 'd') switchcolor(cs.dresscolor, cat ? haircolors : dresscolors);
-    if(xuni == 'f') switchcolor(cs.dresscolor2, dresscolors2);
-    if(xuni == 'u') switchcolor(cs.uicolor, eyecolors);
-    if(uni == ' ' || sym == SDLK_ESCAPE) popScreen();
+    else if(uni == 'p') vid.samegender = !vid.samegender;
+    else if(uni == 's') switchcolor(cs.skincolor, cat ? haircolors : skincolors);
+    else if(uni == 'h') switchcolor(cs.haircolor, haircolors);
+    else if(uni == 'w') switchcolor(cs.swordcolor, cat ? eyecolors : swordcolors);
+    else if(uni == 'd') switchcolor(cs.dresscolor, cat ? haircolors : dresscolors);
+    else if(uni == 'f') switchcolor(cs.dresscolor2, dresscolors2);
+    else if(uni == 'u') switchcolor(cs.uicolor, eyecolors);
+    else if(doexiton(sym, uni)) popScreen();
     };
   }
 
@@ -1320,7 +1317,7 @@ void selectLanguageScreen() {
   dialog::addBreak(50);
   vid.language = -1;
   dialog::addBoolItem(XLAT("default") + ": " + XLAT("EN"), v == -1, '0');
-  dialog::addItem(XLAT("go back"), ' ');
+  dialog::addBack();
 
   dialog::addBreak(50);
 
@@ -1347,14 +1344,13 @@ void selectLanguageScreen() {
   keyhandler = []   (int sym, int uni) {
     dialog::handleNavigation(sym, uni);
     
-    char xuni = uni | 32;
     if(uni == '0') {
       vid.language = -1;
       ANDROID_SETTINGS;
       }
 
-    else if(xuni >= 'a' && xuni < 'a'+NUMLAN) {
-      vid.language = xuni - 'a';
+    else if(uni >= 'a' && uni < 'a'+NUMLAN) {
+      vid.language = uni - 'a';
       ANDROID_SETTINGS;
       }
     
diff --git a/conformal.cpp b/conformal.cpp
index 124e96a9..0314e7d7 100644
--- a/conformal.cpp
+++ b/conformal.cpp
@@ -770,7 +770,7 @@ namespace conformal {
       }
 #endif
       
-    dialog::addItem(XLAT("go back"), ' ');
+    dialog::addBack();
     dialog::display();
     mouseovers = XLAT("see http://www.roguetemple.com/z/hyper/models.php");
     keyhandler = handleKeyC;
diff --git a/debug.cpp b/debug.cpp
index 180dd724..caf827ef 100644
--- a/debug.cpp
+++ b/debug.cpp
@@ -379,7 +379,7 @@ void showCheatMenu() {
   dialog::addItem(XLAT("switch web display"), 'W'-64);
   dialog::addItem(XLAT("peaceful mode"), 'P'-64);
   dialog::addBreak(50);
-  dialog::addItem(XLAT("go back"), ' ');
+  dialog::addBack();
   dialog::display();
   keyhandler = []   (int sym, int uni) {
     dialog::handleNavigation(sym, uni);
diff --git a/dialogs.cpp b/dialogs.cpp
index e74b50eb..1832bf15 100644
--- a/dialogs.cpp
+++ b/dialogs.cpp
@@ -20,6 +20,14 @@ const char* COLORBAR = "###";
 
 namespace dialog {
 
+  void addBack() {
+    addItem(XLAT("go back"), SDLK_ESCAPE);
+    }
+
+  void addHelp() {
+    addItem(XLAT("help"), SDLK_F1);
+    }
+
   namespace zoom {
     int zoomf = 1, shiftx, shifty;
     bool zoomoff = false;
@@ -673,7 +681,7 @@ namespace dialog {
     addBreak(100);
 #endif
     
-    addItem("go back", ' ');
+    dialog::addBack();
     addSelItem(XLAT("default value"), disp(ne.dft), SDLK_HOME);
 
     addBreak(100);
@@ -826,7 +834,7 @@ namespace dialog {
       getcstat = '2';
     if(pages) if(displayfrZ(xr*40, i0, 1, vid.fsize, IFM("3 - ") + XLAT("all"), nlpage == 1 ? 0xD8D8C0 : 0xC0C0C0, 8))
       getcstat = '3';
-    if(i&1) if(displayfrZ(xr*56, i0, 1, vid.fsize, IFM(keyname(' ') + " - ") + XLAT("go back"), 0xC0C0C0, 8))
+    if(i&1) if(displayfrZ(xr*56, i0, 1, vid.fsize, IFM(keyname(SDLK_ESCAPE) + " - ") + XLAT("go back"), 0xC0C0C0, 8))
       getcstat = '0';
     if(i&2) if(displayfrZ(xr*72, i0, 1, vid.fsize, IFM("F1 - ") + XLAT("help"), 0xC0C0C0, 8))
       getcstat = SDLK_F1;
diff --git a/geom-exp.cpp b/geom-exp.cpp
index 325379d0..710a27aa 100644
--- a/geom-exp.cpp
+++ b/geom-exp.cpp
@@ -327,8 +327,8 @@ void showEuclideanMenu() {
       dialog::addBoolItem(XLAT("Poincaré/Klein"), vid.alpha>.5, '1');
     if(torus || quotient == 2)
       dialog::addItem(XLAT("advanced parameters"), '4');  
-    dialog::addItem(XLAT("help"), SDLK_F1);  
-    dialog::addItem(XLAT("back"), '0');  
+    dialog::addHelp();
+    dialog::addBack();
     dialog::display();
   
     keyhandler = [] (int sym, int uni) {
@@ -409,8 +409,8 @@ void showEuclideanMenu() {
       dialog::addItem(XLAT("Chaos mode"), '1');
     dialog::addItem(XLAT("next page"), '-');
     
-    dialog::addItem(XLAT("help"), SDLK_F1);  
-    dialog::addItem(XLAT("back"), '0');
+    dialog::addHelp();
+    dialog::addBack();
     dialog::display();
   
     keyhandler = [] (int sym, int uni) {
diff --git a/goldberg.cpp b/goldberg.cpp
index f0e023db..b28cd55d 100644
--- a/goldberg.cpp
+++ b/goldberg.cpp
@@ -606,8 +606,8 @@ namespace hr { namespace gp {
       dialog::addBoolItem(XLAT("select"), param == internal_representation(config), 'f');
     
     dialog::addBreak(100);
-    dialog::addItem(XLAT("help"), SDLK_F1);
-    dialog::addItem(XLAT("back"), '0');  
+    dialog::addHelp();
+    dialog::addBack();
     dialog::display();
 
     keyhandler = [show_nonthree, texture_remap] (int sym, int uni) {
diff --git a/hyper.h b/hyper.h
index 9167aaf4..36153d72 100644
--- a/hyper.h
+++ b/hyper.h
@@ -1488,6 +1488,9 @@ namespace dialog {
 
   void vpush(int i, const char *name);
   extern vector<pair<string, int> > v;  
+  
+  void addHelp();
+  void addBack();
   }
 
 void checkStunKill(cell *dest);
diff --git a/hyperweb.cpp b/hyperweb.cpp
index e6d102ad..30454dc5 100644
--- a/hyperweb.cpp
+++ b/hyperweb.cpp
@@ -71,7 +71,7 @@ void showDemo() {
 
   dialog::addItem(XLAT("play"), 'f');
   dialog::addItem(XLAT("tutorial"), 'T');
-  dialog::addItem(XLAT("help"), 'h'); dialog::lastItem().keycaption += " / F1";
+  dialog::addHelp(); dialog::lastItem().keycaption += " / F1";
   // dialog::addItem(XLAT("toggle high detail"), 'a');
   dialog::addBreak(100);
 
diff --git a/menus.cpp b/menus.cpp
index 09e1c8b9..b79e2ae1 100644
--- a/menus.cpp
+++ b/menus.cpp
@@ -198,7 +198,7 @@ void showMainMenu() {
 #if CAP_SAVE
   dialog::addItem(XLAT("local highscores"), 't');
 #endif
-  dialog::addItem(XLAT("help"), 'h'); dialog::lastItem().keycaption += " / F1";
+  dialog::addHelp();
   if(cheater)
     dialog::addItem(XLAT("cheats"), 'c');
   else dialog::addBreak(100);
@@ -473,7 +473,7 @@ void showChangeMode() {
 
   dialog::addBreak(50);
   
-  dialog::addItem(XLAT("go back"), ' ');
+  dialog::addBack();
   dialog::display();
   
   keyhandler = [] (int sym, int uni) {
@@ -893,9 +893,9 @@ void showMessageLog() {
   
   string timeformats[5] = {"turns", "real time", "game time", "precise", "no time"};
   
-  displayButton(xr*70, i0, IFM("0 - ") + XLAT("back"), '0', 8);
-  displayButton(xr*10, i0, IFM("c - ") + XLAT("clear"), '0', 8);
-  displayButton(xr*40, i0, IFM("t - ") + XLAT(timeformats[timeformat]), '0', 8);
+  displayButton(xr*70, i0, IFM(dialog::keyname(SDLK_ESCAPE) + " - ") + XLAT("go back"), SDLK_ESCAPE, 8);
+  displayButton(xr*10, i0, IFM("c - ") + XLAT("clear"), 'c', 8);
+  displayButton(xr*40, i0, IFM("t - ") + XLAT(timeformats[timeformat]), 't', 8);
   
   keyhandler = [lines] (int sym, int uni) {
     if(uni == PSEUDOKEY_WHEELDOWN) messagelogpos++;
diff --git a/netgen.cpp b/netgen.cpp
index 38e77a05..582cbf94 100644
--- a/netgen.cpp
+++ b/netgen.cpp
@@ -658,7 +658,7 @@ namespace hr { namespace netgen {
       dialog::addItem(XLAT("create the model"), 'c');
       dialog::addItem(XLAT("design the net"), 'd');
       dialog::addBreak(50);
-      dialog::addItem(XLAT("go back"), ' ');
+      dialog::addBack();
       
       dialog::display();
       }
diff --git a/pattern2.cpp b/pattern2.cpp
index 44d00fdc..22867a6e 100644
--- a/pattern2.cpp
+++ b/pattern2.cpp
@@ -1988,7 +1988,7 @@ namespace linepatterns {
       dialog::addColorItem(among(patterns[numpat].id, patVine, patPower) && gp::on ? XLAT("Goldberg") + (patterns[numpat].id == patVine ? " " : ""): XLAT(patterns[numpat].lpname), patterns[numpat].color, 'a'+numpat);
   
     dialog::addBreak(50);
-    dialog::addItem(XLAT("go back"), ' ');
+    dialog::addBack();
     
     dialog::addBreak(50);
     dialog::addInfo("change the alpha parameter to show the lines");
diff --git a/rogueviz.cpp b/rogueviz.cpp
index 24cd47d5..2c506e41 100644
--- a/rogueviz.cpp
+++ b/rogueviz.cpp
@@ -1557,7 +1557,7 @@ void showMenu() {
     kohonen::showMenu();
 
   dialog::addBreak(50);
-  dialog::addItem(XLAT("go back"), ' ');
+  dialog::addBack();
 
   dialog::display();
   
diff --git a/rug.cpp b/rug.cpp
index f15d6bac..e9fcd4b0 100644
--- a/rug.cpp
+++ b/rug.cpp
@@ -1703,7 +1703,7 @@ void show() {
   dialog::init(XLAT("hypersian rug mode"), iinf[itPalace].color, 150, 100);
   
   dialog::addItem(XLAT("what's this?"), 'h');
-  dialog::addItem(XLAT("go back"), ' ');
+  dialog::addBack();
 
   dialog::addBoolItem(XLAT("enable the Hypersian Rug mode"), rug::rugged, 'u');
   
diff --git a/scores.cpp b/scores.cpp
index c84819a5..cd0f0b55 100644
--- a/scores.cpp
+++ b/scores.cpp
@@ -222,7 +222,7 @@ void show() {
 
   displayButton(xr*10, i0, IFM("s - ") + XLAT("sort"), 's', 8);
   displayButton(xr*30, i0, IFM("t - ") + XLAT("choose"), 't', 8);
-  displayButton(xr*50, i0, IFM(dialog::keyname(' ') + " - ") + XLAT("go back"), '0', 8);
+  displayButton(xr*50, i0, IFM(dialog::keyname(SDLK_ESCAPE) + " - ") + XLAT("go back"), '0', 8);
 
   keyhandler = [] (int sym, int uni) {
     if(sym == SDLK_LEFT || sym == SDLK_KP4 || sym == 'h' || sym == 'a') {
diff --git a/shmup.cpp b/shmup.cpp
index af5e9056..9cff3783 100644
--- a/shmup.cpp
+++ b/shmup.cpp
@@ -303,9 +303,9 @@ void showShmupConfig() {
     dialog::addItem(XLAT("save the configuration"), 'c');
 #endif
 
-    dialog::addItem(XLAT("help"), 'h');
+    dialog::addHelp();
 
-    dialog::addItem(XLAT("go back"), ' ');
+    dialog::addBack();
     dialog::display();
     }
   
diff --git a/textures.cpp b/textures.cpp
index 6b058264..e4754777 100644
--- a/textures.cpp
+++ b/textures.cpp
@@ -950,7 +950,7 @@ void showMagicMenu() {
   
   dialog::addSelItem(XLAT("delete markers"), its(size(amp)), 'D');
   dialog::addItem(XLAT("perform auto-adjustment"), 'R');
-  dialog::addItem(XLAT("back"), '0');
+  dialog::addBack();
 
   getcstat = '-';
 
@@ -1095,8 +1095,8 @@ void showMenu() {
     dialog::addItem(XLAT("save texture config"), 's');
     }
   
-  dialog::addItem(XLAT("help"), SDLK_F1);  
-  dialog::addItem(XLAT("back"), '0');  
+  dialog::addHelp();
+  dialog::addBack();
   
   getcstat = '-';
 
diff --git a/tour.cpp b/tour.cpp
index b801835b..17cd5990 100644
--- a/tour.cpp
+++ b/tour.cpp
@@ -277,7 +277,7 @@ namespace ss {
       }
     dialog::addBreak(50);
     if(size(slideshows) > 1) dialog::addItem(XLAT("change slideshow"), '1');
-    dialog::addItem(XLAT("go back"), ' ');
+    dialog::addBack();
     dialog::display();
     keyhandler = [] (int sym, int uni) {
       if(uni >= 'a' && uni < 'a' + sssize) {
diff --git a/yendor.cpp b/yendor.cpp
index 1e4fe6ec..745fa92e 100644
--- a/yendor.cpp
+++ b/yendor.cpp
@@ -482,6 +482,8 @@ namespace yendor {
       easy ? "Challenges do not get harder" : "Each challenge gets harder after each victory"),
       " " + XLAT(easy ? "easy" : "challenge"), '1');
     
+    dialog::addBack();
+    dialog::addHelp();
     dialog::display();
     
     int yc = char_to_yendor(getcstat);
@@ -1078,9 +1080,11 @@ namespace peace {
     dialog::addBreak(100);
     dialog::addItem(XLAT(otherpuzzles ? "memory game" : "puzzles and exploration"), '1');
     dialog::addBoolItem(XLAT("display hints"), hint, '2');
-    dialog::addItem(XLAT("help"), SDLK_F1);
     dialog::addItem(XLAT("Return to the normal game"), '0');
-    
+
+    dialog::addBreak(50);
+    dialog::addHelp();
+    dialog::addBack();    
     dialog::display();
     
     keyhandler = [] (int sym, int uni) {