[gentoo-commits] proj/ufed:master commit in: /

[Sven Eden]

commit:     489db58cb8a16b89650624a3a70b43eb008b8a4c
Author:     Sven Eden <sven.eden <AT> gmx <DOT> de>
AuthorDate: Mon Mar  4 17:58:30 2013 +0000
Commit:     Sven Eden <sven.eden <AT> gmx <DOT> de>
CommitDate: Mon Mar  4 17:58:30 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/ufed.git;a=commit;h=489db58c

Added a new member "row" to the sKey struct to add information about in which row a key is to be displayed.

---
 ufed-curses-checklist.c |   18 +++++++++---------
 ufed-curses-help.c      |    8 ++++----
 ufed-curses-types.h     |    1 +
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/ufed-curses-checklist.c b/ufed-curses-checklist.c
index 7e0f018..2118c9c 100644
--- a/ufed-curses-checklist.c
+++ b/ufed-curses-checklist.c
@@ -20,15 +20,15 @@ static sFlag*  flags           = NULL;
 
 #define mkKey(x) x, sizeof(x)-1
 static const sKey keys[] = {
-	{ '?',      mkKey("Help (?)")             },
-	{ '\n',     mkKey("Save (Enter)")         },
-	{ '\033',   mkKey("Cancel (Esc)")         },
-	{ -1,       mkKey("Toggle :")             },
-	{ KEY_F(5), mkKey("Local/Global (F5)")    },
-	{ KEY_F(6), mkKey("Installed (F6)")       },
-	{ KEY_F(7), mkKey("Masked/Forced (F7)")   },
-	{ KEY_F(9), mkKey("Pkg/Desc Order (F9)")  },
-	{ '\0',     mkKey("")                     }
+	{ '?',      mkKey("Help (?)"),            0 },
+	{ '\n',     mkKey("Save (Enter)"),        0 },
+	{ '\033',   mkKey("Cancel (Esc)"),        0 },
+	{ -1,       mkKey("Toggle :"),            1 },
+	{ KEY_F(5), mkKey("Local/Global (F5)"),   1 },
+	{ KEY_F(6), mkKey("Installed (F6)"),      1 },
+	{ KEY_F(7), mkKey("Masked/Forced (F7)"),  1 },
+	{ KEY_F(9), mkKey("Pkg/Desc Order (F9)"), 1 },
+	{ '\0',     mkKey(""),                    0 }
 };
 #undef mkKey
 

diff --git a/ufed-curses-help.c b/ufed-curses-help.c
index 572ccec..7a9115d 100644
--- a/ufed-curses-help.c
+++ b/ufed-curses-help.c
@@ -283,12 +283,12 @@ static void free_lines(void)
 	}
 }
 
-static const sKey keys[] = {
 #define key(x) x, sizeof(x)-1
-	{ '\033', key("Back (Esc)") },
-	{ '\0',   key("")         }
-#undef key
+static const sKey keys[] = {
+	{ '\033', key("Back (Esc)"), 0 },
+	{ '\0',   key(""), 0         }
 };
+#undef key
 
 static int drawline(sFlag* line, bool highlight)
 {

diff --git a/ufed-curses-types.h b/ufed-curses-types.h
index 7eb7991..af7deec 100644
--- a/ufed-curses-types.h
+++ b/ufed-curses-types.h
@@ -148,6 +148,7 @@ typedef struct sKey_ {
 	int key;           //!< curses key or -1 if no key shall be used
 	const char *descr; //!< Help text to display
 	size_t length;     //!< length of the description
+	int row;           //!< On which row this key is to be displayed, 0 or 1
 } sKey;