X-Git-Url: https://plomlompom.com/repos/index.html?a=blobdiff_plain;f=roguelike.c;h=052f7ffd6139eb449f97e5a479d164e11126f21d;hb=bdce9a4a15d59ade95a980050ec9a3a8de88caef;hp=e2c5474869a7132eb64d19797ad059b8593e0afd;hpb=614f85987282b786d943fcb448b54086ad3a27b1;p=plomrogue
diff --git a/roguelike.c b/roguelike.c
index e2c5474..052f7ff 100644
--- a/roguelike.c
+++ b/roguelike.c
@@ -172,6 +172,49 @@ int get_action_key (struct KeyBinding * keybindings, char * name) {
i++;
return keybindings[i].key; }
+char * get_keyname(int keycode) {
+// Translate some keycodes to readable names of max 9 chars.
+ char * keyname;
+ keyname = malloc(15);
+ if (32 < keycode && keycode < 127)
+ sprintf(keyname, "%c", keycode);
+ else if (keycode == 9)
+ sprintf(keyname, "TAB");
+ else if (keycode == 10)
+ sprintf(keyname, "RETURN");
+ else if (keycode == 27)
+ sprintf(keyname, "ESCAPE");
+ else if (keycode == 32)
+ sprintf(keyname, "SPACE");
+ else if (keycode == KEY_UP)
+ sprintf(keyname, "UP");
+ else if (keycode == KEY_DOWN)
+ sprintf(keyname, "DOWN");
+ else if (keycode == KEY_LEFT)
+ sprintf(keyname, "LEFT");
+ else if (keycode == KEY_RIGHT)
+ sprintf(keyname, "RIGHT");
+ else if (keycode == KEY_HOME)
+ sprintf(keyname, "HOME");
+ else if (keycode == KEY_BACKSPACE)
+ sprintf(keyname, "BACKSPACE");
+ else if (keycode >= KEY_F0 && keycode <= KEY_F(63)) {
+ int f = keycode - KEY_F0;
+ sprintf(keyname, "F%d", f); }
+ else if (keycode == KEY_DC)
+ sprintf(keyname, "DELETE");
+ else if (keycode == KEY_IC)
+ sprintf(keyname, "INSERT");
+ else if (keycode == KEY_NPAGE)
+ sprintf(keyname, "NEXT PAGE");
+ else if (keycode == KEY_PPAGE)
+ sprintf(keyname, "PREV PAGE");
+ else if (keycode == KEY_END)
+ sprintf(keyname, "END");
+ else
+ sprintf(keyname, "(unknown)");
+ return keyname; }
+
void draw_keys_window (struct Win * win) {
// Draw keybinding window.
struct World * world = (struct World *) win->data;
@@ -186,17 +229,20 @@ void draw_keys_window (struct Win * win) {
offset = keyswindata->select - (height_av / 2);
else
offset = keyswindata->max - height_av + 1; }
- int keydescwidth = 3;
+ int keydescwidth = 9; // max length assured by get_keyname()
char * keydesc = malloc(keydescwidth + 1);
attr_t attri;
int y, x;
+ char * keyname;
for (y = 0; 0 != keybindings[offset + y].name && y < height_av; y++) {
attri = 0;
if (y == keyswindata->select - offset) {
attri = A_REVERSE;
if (1 == keyswindata->edit)
attri = attri | A_BLINK; }
- snprintf(keydesc, keydescwidth + 1, "%3d ", keybindings[y + offset].key);
+ keyname = get_keyname(keybindings[y + offset].key);
+ snprintf(keydesc, keydescwidth + 1, "%-9s", keyname);
+ free(keyname);
for (x = 0; x < width_av; x++)
if (strlen(keydesc) > x)
mvwaddch(win->curses_win, y + 1, x + win->border_left, keydesc[x] | attri);
@@ -318,6 +364,7 @@ int main () {
int key;
while (1) {
+ draw_all_windows (&win_meta);
key = getch();
if (key == get_action_key(world.keybindings, "quit"))
break;
@@ -350,53 +397,42 @@ int main () {
else if (key == get_action_key(world.keybindings, "keys nav up") && world.keyswindata->select > 0) {
world.keyswindata->select--;
draw_all_windows (&win_meta); }
- else if (key == get_action_key(world.keybindings, "keys nav down") && world.keyswindata->select < world.keyswindata->max) {
+ else if (key == get_action_key(world.keybindings, "keys nav down") && world.keyswindata->select < world.keyswindata->max)
world.keyswindata->select++;
- draw_all_windows (&win_meta); }
else if (key == get_action_key(world.keybindings, "keys mod")) {
world.keyswindata->edit = 1;
draw_all_windows (&win_meta);
key = getch();
if (key < 1000) // ensure maximum of three digits in key code field
world.keybindings[world.keyswindata->select].key = key;
- world.keyswindata->edit = 0;
- draw_all_windows (&win_meta); }
- else if (key == get_action_key(world.keybindings, "map up") && map.offset_y > 0) {
+ world.keyswindata->edit = 0; }
+ else if (key == get_action_key(world.keybindings, "map up") && map.offset_y > 0)
map.offset_y--;
- draw_all_windows (&win_meta); }
- else if (key == get_action_key(world.keybindings, "map down")) {
+ else if (key == get_action_key(world.keybindings, "map down"))
map.offset_y++;
- draw_all_windows (&win_meta); }
- else if (key == get_action_key(world.keybindings, "map right")) {
+ else if (key == get_action_key(world.keybindings, "map right"))
map.offset_x++;
- draw_all_windows (&win_meta); }
- else if (key == get_action_key(world.keybindings, "map left") && map.offset_x > 0) {
+ else if (key == get_action_key(world.keybindings, "map left") && map.offset_x > 0)
map.offset_x--;
- draw_all_windows (&win_meta); }
else if (key == get_action_key(world.keybindings, "player down") && map.player_y < map.height - 1) {
update_info (&win_info);
update_log (&win_log, "\nYou move south.");
- map.player_y++;
- draw_all_windows (&win_meta); }
+ map.player_y++; }
else if (key == get_action_key(world.keybindings, "player up") && map.player_y > 0) {
update_info (&win_info);
update_log (&win_log, "\nYou move north.");
- map.player_y--;
- draw_all_windows (&win_meta); }
+ map.player_y--; }
else if (key == get_action_key(world.keybindings, "player right") && map.player_x < map.width - 1) {
update_info (&win_info);
update_log (&win_log, "\nYou move east.");
- map.player_x++;
- draw_all_windows (&win_meta); }
+ map.player_x++; }
else if (key == get_action_key(world.keybindings, "player left") && map.player_x > 0) {
update_info (&win_info);
update_log (&win_log, "\nYou move west.");
- map.player_x--;
- draw_all_windows (&win_meta); }
+ map.player_x--; }
else if (key == get_action_key(world.keybindings, "wait") ) {
update_info (&win_info);
- update_log (&win_log, "\nYou wait.");
- draw_all_windows(&win_meta); } }
+ update_log (&win_log, "\nYou wait."); } }
endwin();
return 0; }