The following commit has been merged in the master branch:
commit e482e8c79ad63708bca6da5fec1ed0f444e102a1
Author: Guillem Jover <[email protected]>
Date: Tue Apr 16 20:20:43 2013 +0200
dselect: Rename C macro to CTRL
diff --git a/dselect/bindings.h b/dselect/bindings.h
index 2566e49..ba84954 100644
--- a/dselect/bindings.h
+++ b/dselect/bindings.h
@@ -89,4 +89,8 @@ extern const keybindings::orgbinding
packagelist_korgbindings[];
extern const keybindings::interpretation methodlist_kinterps[];
extern const keybindings::orgbinding methodlist_korgbindings[];
+#ifndef CTRL
+#define CTRL(x) ((x) - 'a' + 1)
+#endif
+
#endif /* BINDINGS_H */
diff --git a/dselect/main.cc b/dselect/main.cc
index 6cd4503..f616369 100644
--- a/dselect/main.cc
+++ b/dselect/main.cc
@@ -431,7 +431,6 @@ refreshmenu(void)
}
urqresult urq_menu(void) {
-#define C(x) ((x)-'a'+1)
int entries, c;
entries= refreshmenu();
int cursor=0;
@@ -449,9 +448,9 @@ urqresult urq_menu(void) {
}
}
- if (c==C('n') || c==KEY_DOWN || c==' ' || c=='j') {
+ if (c == CTRL('n') || c == KEY_DOWN || c == ' ' || c == 'j') {
dme(cursor,0); cursor++; cursor %= entries; dme(cursor,1);
- } else if (c==C('p') || c==KEY_UP || c==C('h') ||
+ } else if (c == CTRL('p') || c == KEY_UP || c == CTRL('h') ||
c==KEY_BACKSPACE || c==KEY_DC || c=='k') {
dme(cursor,0); cursor+= entries-1; cursor %= entries; dme(cursor,1);
} else if (c=='\n' || c=='\r' || c==KEY_ENTER) {
@@ -470,7 +469,7 @@ urqresult urq_menu(void) {
internerr("unknown menufn %d", res);
}
refreshmenu(); dme(cursor,1);
- } else if (c==C('l')) {
+ } else if (c == CTRL('l')) {
clearok(stdscr,TRUE); clear(); refreshmenu(); dme(cursor,1);
} else if (isdigit(c)) {
char buf[2]; buf[0]=c; buf[1]=0; c=atoi(buf);
diff --git a/dselect/methkeys.cc b/dselect/methkeys.cc
index 85e096b..2f00fae 100644
--- a/dselect/methkeys.cc
+++ b/dselect/methkeys.cc
@@ -52,8 +52,6 @@ const keybindings::interpretation methodlist_kinterps[] = {
{ 0, 0, 0, qa_noquit
}
};
-#define C(x) ((x)-'a'+1)
-
const keybindings::orgbinding methodlist_korgbindings[]= {
{ 'j', "down" }, // vi style
//{ 'n', "down" }, // no style
@@ -62,18 +60,18 @@ const keybindings::orgbinding methodlist_korgbindings[]= {
//{ 'p', "up" }, // no style
{ KEY_UP, "up" },
- { C('f'), "scrollon" }, // vi style
+ { CTRL('f'), "scrollon" }, // vi style
{ 'N', "scrollon" },
{ KEY_NPAGE, "scrollon" },
{ ' ', "scrollon" },
- { C('b'), "scrollback" }, // vi style
+ { CTRL('b'), "scrollback" }, // vi style
{ 'P', "scrollback" },
{ KEY_PPAGE, "scrollback" },
{ KEY_BACKSPACE, "scrollback" },
{ 0177,/*DEL*/ "scrollback" },
- { C('h'), "scrollback" },
- { C('n'), "scrollon1" },
- { C('p'), "scrollback1" },
+ { CTRL('h'), "scrollback" },
+ { CTRL('n'), "scrollon1" },
+ { CTRL('p'), "scrollback1" },
{ 't', "top" },
{ KEY_HOME, "top" },
@@ -83,15 +81,15 @@ const keybindings::orgbinding methodlist_korgbindings[]= {
{ 'u', "iscrollback" },
{ 'd', "iscrollon" },
- { C('u'), "iscrollback1" },
- { C('d'), "iscrollon1" },
+ { CTRL('u'), "iscrollback1" },
+ { CTRL('d'), "iscrollon1" },
{ 'B', "panback" },
{ KEY_LEFT, "panback" },
{ 'F', "panon" },
{ KEY_RIGHT, "panon" },
- { C('b'), "panback1" },
- { C('f'), "panon1" },
+ { CTRL('b'), "panback1" },
+ { CTRL('f'), "panon1" },
{ '?', "help" },
{ KEY_HELP, "help" },
@@ -99,7 +97,7 @@ const keybindings::orgbinding methodlist_korgbindings[]= {
{ '/', "search" },
{ 'n', "searchagain" },
{ '\\', "searchagain" },
- { C('l'), "redraw" },
+ { CTRL('l'), "redraw" },
{ KEY_ENTER, "select-and-quit" },
{ '\r', "select-and-quit" },
diff --git a/dselect/pkgkeys.cc b/dselect/pkgkeys.cc
index 35f5473..8d05e6b 100644
--- a/dselect/pkgkeys.cc
+++ b/dselect/pkgkeys.cc
@@ -69,8 +69,6 @@ const keybindings::interpretation packagelist_kinterps[] = {
{ 0, 0, 0, qa_noquit
}
};
-#define C(x) ((x)-'a'+1)
-
const keybindings::orgbinding packagelist_korgbindings[]= {
{ 'j', "down" }, // vi style
{ KEY_DOWN, "down" },
@@ -85,9 +83,9 @@ const keybindings::orgbinding packagelist_korgbindings[]= {
{ KEY_PPAGE, "scrollback" },
{ KEY_BACKSPACE, "scrollback" },
{ 0177, "scrollback" }, // ASCII DEL
- { C('h'), "scrollback" },
- { C('n'), "scrollon1" },
- { C('p'), "scrollback1" },
+ { CTRL('h'), "scrollback" },
+ { CTRL('n'), "scrollon1" },
+ { CTRL('p'), "scrollback1" },
{ 't', "top" },
{ KEY_HOME, "top" },
@@ -97,15 +95,15 @@ const keybindings::orgbinding packagelist_korgbindings[]= {
{ 'u', "iscrollback" },
{ 'd', "iscrollon" },
- { C('u'), "iscrollback1" },
- { C('d'), "iscrollon1" },
+ { CTRL('u'), "iscrollback1" },
+ { CTRL('d'), "iscrollon1" },
{ 'B', "panback" },
{ KEY_LEFT, "panback" },
{ 'F', "panon" },
{ KEY_RIGHT, "panon" },
- { C('b'), "panback1" },
- { C('f'), "panon1" },
+ { CTRL('b'), "panback1" },
+ { CTRL('f'), "panon1" },
{ '+', "install" },
{ KEY_IC, "install" },
@@ -125,7 +123,7 @@ const keybindings::orgbinding packagelist_korgbindings[]= {
{ 'O', "swapstatorder" },
{ 'v', "verbose" },
{ 'V', "versiondisplay" },
- { C('l'), "redraw" },
+ { CTRL('l'), "redraw" },
{ '/', "search" },
{ 'n', "searchagain" },
{ '\\', "searchagain" },
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
