slightly more obvious menu copy

Still sucks, though..

3 files changed, 44 insertions, 9 deletions

diff --git a/src/kilo.c b/src/kilo.c
index daa5e86..195f1f3 100644
--- a/src/kilo.c
+++ b/src/kilo.c
@@ -674,7 +674,21 @@ static void editorMenu(void) {
     draw_menu_item("^f", "find");
     draw_menu_item("^h", "backspace");
     draw_menu_item("^l", "end of line");
-    draw_menu_item("^/|^-|^_", "(un)comment line");
+    /* draw_menu_item("^/|^-|^_", "(un)comment line"); */
+    attroff(A_REVERSE);
+    mvaddstr(LINES-1, menu_column, " ^/");
+    attron(COLOR_PAIR(COLOR_PAIR_MENU_ALTERNATE));
+    addstr("|");
+    attroff(COLOR_PAIR(COLOR_PAIR_MENU_ALTERNATE));
+    addstr("^-");
+    attron(COLOR_PAIR(COLOR_PAIR_MENU_ALTERNATE));
+    addstr("|");
+    attroff(COLOR_PAIR(COLOR_PAIR_MENU_ALTERNATE));
+    addstr("^_ ");
+    menu_column += 10;
+    attron(A_REVERSE);
+    mvaddstr(LINES-1, menu_column, " (un)comment line ");
+    menu_column += 18;
     attrset(A_NORMAL);
 }
 
diff --git a/src/lua.c b/src/lua.c
index 9707712..9f99b1f 100644
--- a/src/lua.c
+++ b/src/lua.c
@@ -475,17 +475,33 @@ static void recent_changes_menu (int cursor, int history_array_size) {
   draw_menu_item("^x", "go back");
   /* draw_menu_item("↓|space", "older"); */
   attroff(A_REVERSE);
-  mvaddstr(LINES-1, menu_column, " ↓|space ");
+  mvaddstr(LINES-1, menu_column, " ↓");
+  attron(COLOR_PAIR(COLOR_PAIR_MENU_ALTERNATE));
+  addstr("|");
+  attroff(COLOR_PAIR(COLOR_PAIR_MENU_ALTERNATE));
+  addstr("space ");
   menu_column += 9;  /* strlen isn't sufficient */
   attron(A_REVERSE);
   draw_string_on_menu("older");
-  /* draw_menu_item("↑|backspace", "newer"); */
+  /* draw_menu_item("↑|backspace|delete|^h", "newer"); */
   attroff(A_REVERSE);
-  mvaddstr(LINES-1, menu_column, " ↑|backspace|delete|^h ");
+  mvaddstr(LINES-1, menu_column, " ↑");
+  attron(COLOR_PAIR(COLOR_PAIR_MENU_ALTERNATE));
+  addstr("|");
+  attroff(COLOR_PAIR(COLOR_PAIR_MENU_ALTERNATE));
+  addstr("backspace");
+  attron(COLOR_PAIR(COLOR_PAIR_MENU_ALTERNATE));
+  addstr("|");
+  attroff(COLOR_PAIR(COLOR_PAIR_MENU_ALTERNATE));
+  addstr("delete");
+  attron(COLOR_PAIR(COLOR_PAIR_MENU_ALTERNATE));
+  addstr("|");
+  attroff(COLOR_PAIR(COLOR_PAIR_MENU_ALTERNATE));
+  addstr("^h ");
   menu_column += 23;
   attron(A_REVERSE);
   draw_string_on_menu("newer");
-  draw_menu_item("^e", "edit|add note");
+  draw_menu_item("^e", "edit note");
   if (cursor < history_array_size)
     draw_menu_item("^u", "undo everything after this");
   attrset(A_NORMAL);
@@ -930,6 +946,7 @@ void developer_mode (lua_State *L) {
   init_pair(COLOR_PAIR_NORMAL, COLOR_FOREGROUND, COLOR_BACKGROUND);
   init_pair(COLOR_PAIR_HIGHLIGHT, COLOR_HIGHLIGHT_FOREGROUND, COLOR_HIGHLIGHT_BACKGROUND);
   init_pair(COLOR_PAIR_FADE, COLOR_FADE, COLOR_BACKGROUND);
+  init_pair(COLOR_PAIR_MENU_ALTERNATE, COLOR_MENU_ALTERNATE, COLOR_BACKGROUND);
   init_pair(COLOR_PAIR_LUA_COMMENT, COLOR_LUA_COMMENT, COLOR_BACKGROUND);
   init_pair(COLOR_PAIR_LUA_KEYWORD, COLOR_LUA_KEYWORD, COLOR_BACKGROUND);
   init_pair(COLOR_PAIR_LUA_CONSTANT, COLOR_LUA_CONSTANT, COLOR_BACKGROUND);
diff --git a/src/teliva.h b/src/teliva.h
index 6345158..17f3d1c 100644
--- a/src/teliva.h
+++ b/src/teliva.h
@@ -56,6 +56,7 @@ enum color {
   COLOR_FOREGROUND = 238,                     // almost black
   COLOR_BACKGROUND = 253,                     // almost white
   COLOR_FADE = 244,                           // closer to background
+  COLOR_MENU_ALTERNATE = 248,
   COLOR_HIGHLIGHT_FOREGROUND = 238,
   COLOR_HIGHLIGHT_BACKGROUND = 250,
   COLOR_ERROR_FOREGROUND = COLOR_BACKGROUND,
@@ -72,6 +73,7 @@ enum color {
   COLOR_FOREGROUND = 253,                     // almost white
   COLOR_BACKGROUND = 238,                     // almost black
   COLOR_FADE = 244,                           // closer to background
+  COLOR_MENU_ALTERNATE = 244,
   COLOR_HIGHLIGHT_FOREGROUND = 238,
   COLOR_HIGHLIGHT_BACKGROUND = 250,
   COLOR_ERROR_FOREGROUND = COLOR_BACKGROUND,
@@ -88,6 +90,7 @@ enum color {
   COLOR_FOREGROUND = 250,                     // almost white
   COLOR_BACKGROUND = 24,                      // dark blue-green
   COLOR_FADE = 246,                           // closer to background
+  COLOR_MENU_ALTERNATE = 244,
   COLOR_HIGHLIGHT_FOREGROUND = 250,
   COLOR_HIGHLIGHT_BACKGROUND = 31,
   COLOR_ERROR_FOREGROUND = 250,
@@ -104,10 +107,11 @@ enum color_pair {
   COLOR_PAIR_NORMAL = 0,
   COLOR_PAIR_HIGHLIGHT = 1,
   COLOR_PAIR_FADE = 2,
-  COLOR_PAIR_LUA_COMMENT = 3,
-  COLOR_PAIR_LUA_KEYWORD = 4,
-  COLOR_PAIR_LUA_CONSTANT = 5,
-  COLOR_PAIR_MATCH = 6,
+  COLOR_PAIR_MENU_ALTERNATE = 3,
+  COLOR_PAIR_LUA_COMMENT = 4,
+  COLOR_PAIR_LUA_KEYWORD = 5,
+  COLOR_PAIR_LUA_CONSTANT = 6,
+  COLOR_PAIR_MATCH = 7,
   COLOR_PAIR_ERROR = 255,
 };