X-Git-Url: https://plomlompom.com/repos/index.html?a=blobdiff_plain;ds=sidebyside;f=roguelike.c;h=6d75aa949ae181b5afd9ac783874905fde314d17;hb=e8f215126791c763c3168b9bb9083294a42b606c;hp=e2c5474869a7132eb64d19797ad059b8593e0afd;hpb=614f85987282b786d943fcb448b54086ad3a27b1;p=plomrogue
diff --git a/roguelike.c b/roguelike.c
index e2c5474..6d75aa9 100644
--- a/roguelike.c
+++ b/roguelike.c
@@ -31,41 +31,34 @@ void draw_with_linebreaks (struct Win * win, char * text, int start_y) {
// Write text into window content space. Start on row start_y. Fill unused rows with whitespace.
int x, y;
char toggle;
- int height_av = win->height - 1;
- int width_av = win->width - 1;
char fin = 0;
int z = -1;
- for (y = start_y; y < height_av; y++) {
+ for (y = start_y; y < win->height; y++) {
if (0 == fin)
toggle = 0;
- for (x = 0; x < width_av; x++) {
+ for (x = 0; x < win->width; x++) {
if (0 == toggle) {
z++;
if ('\n' == text[z]) {
- mvwaddch(win->curses_win, y+1, x+win->border_left, ' ');
toggle = 1;
continue; }
else
- mvwaddch(win->curses_win, y+1, x+win->border_left, text[z]);
+ mvwaddch(win->curses_win, y, x, text[z]);
if ('\n' == text[z+1]) {
z++;
toggle = 1; }
else if (0 == text[z+1]) {
toggle = 1;
- fin = 1; } }
- else
- mvwaddch(win->curses_win, y+1, x+win->border_left, ' '); } } }
+ fin = 1; } } } } }
void draw_text_from_bottom (struct Win * win) {
// Draw text in win->data from end/bottom to the top.
char * text = (char *) win->data;
- int width_av = win->width - 1;
- int height_av = win->height - 1;
char toggle = 0;
int x, y, offset;
int z = -1;
- for (y = 0; 0 == toggle; y++) // Determine number of lines text would have in a window of available
- for (x = 0; x < width_av; x++) { // width, but infinite height.
+ for (y = 0; 0 == toggle; y++) // Determine number of lines text would have in a window of
+ for (x = 0; x < win->width; x++) { // available width, but infinite height.
z++;
if ('\n' == text[z]) // Treat \n and \0 as control characters for incrementing y and
break; // stopping the loop. Make sure they don't count as cell space
@@ -77,15 +70,12 @@ void draw_text_from_bottom (struct Win * win) {
break; } }
z = -1;
int start_y = 0;
- if (y < height_av) { // Depending on what is bigger, determine start point in window or in text.
- start_y = height_av - y;
- for (y = 0; y < start_y; y++)
- for (x = 0; x < width_av; x++)
- mvwaddch(win->curses_win, y+1, x+win->border_left, ' '); }
- else if (y > height_av) {
- offset = y - height_av;
+ if (y < win->height) // Depending on what is bigger, determine start point in window or in text.
+ start_y = win->height - y;
+ else if (y > win->height) {
+ offset = y - win->height;
for (y = 0; y < offset; y++)
- for (x = 0; x < width_av; x++) {
+ for (x = 0; x < win->width; x++) {
z++;
if ('\n' == text[z])
break;
@@ -97,24 +87,20 @@ void draw_text_from_bottom (struct Win * win) {
void draw_map (struct Win * win) {
// Draw map determined by win->data Map struct into window. Respect offset.
- int height_av = win->height - 1;
- int width_av = win->width - 1;
struct Map map = * (struct Map *) win->data;
char * cells = map.cells;
int width_map_av = map.width - map.offset_x;
int height_map_av = map.height - map.offset_y;
int x, y, z;
- for (y = 0; y < height_av; y++) {
+ for (y = 0; y < win->height; y++) {
z = map.offset_x + (map.offset_y + y) * (map.width);
- for (x = 0; x < width_av; x++) {
+ for (x = 0; x < win->width; x++) {
if (y < height_map_av && x < width_map_av) {
if (z == (map.width * map.player_y) + map.player_x)
- mvwaddch(win->curses_win, y+1, x+win->border_left, '@');
+ mvwaddch(win->curses_win, y, x, '@');
else
- mvwaddch(win->curses_win, y+1, x+win->border_left, cells[z]);
- z++; }
- else
- mvwaddch(win->curses_win, y+1, x+win->border_left, ' '); } } }
+ mvwaddch(win->curses_win, y, x, cells[z]);
+ z++; } } } }
void draw_info (struct Win * win) {
// Draw info window by appending win->data integer value to "Turn: " display.
@@ -172,43 +158,83 @@ 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;
struct KeysWinData * keyswindata = (struct KeysWinData *) world->keyswindata;
struct KeyBinding * keybindings = world->keybindings;
- int height_av = win->height - 1;
- int width_av = win->width - 1;
int offset = 0;
- if (keyswindata->max >= height_av) {
- if (keyswindata->select > height_av / 2)
- if (keyswindata->select < (keyswindata->max - (height_av / 2)))
- offset = keyswindata->select - (height_av / 2);
+ if (keyswindata->max >= win->height) {
+ if (keyswindata->select > win->height / 2) {
+ if (keyswindata->select < (keyswindata->max - (win->height / 2)))
+ offset = keyswindata->select - (win->height / 2);
else
- offset = keyswindata->max - height_av + 1; }
- int keydescwidth = 3;
- char * keydesc = malloc(keydescwidth + 1);
+ offset = keyswindata->max - win->height + 1; } }
+ int keydescwidth = 9 + 1; // max length assured by get_keyname() + \0
+ char * keydesc = malloc(keydescwidth);
attr_t attri;
int y, x;
- for (y = 0; 0 != keybindings[offset + y].name && y < height_av; y++) {
+ char * keyname;
+ for (y = 0; y <= keyswindata->max && y < win->height; 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);
- for (x = 0; x < width_av; x++)
- if (strlen(keydesc) > x)
- mvwaddch(win->curses_win, y + 1, x + win->border_left, keydesc[x] | attri);
+ keyname = get_keyname(keybindings[y + offset].key);
+ snprintf(keydesc, keydescwidth, "%-9s", keyname);
+ free(keyname);
+ for (x = 0; x < win->width; x++)
+ if (x < strlen(keydesc))
+ mvwaddch(win->curses_win, y, x, keydesc[x] | attri);
else if (strlen(keydesc) < x && x < strlen(keybindings[y + offset].name) + strlen(keydesc) + 1)
- mvwaddch(win->curses_win, y + 1, x + win->border_left, keybindings[y + offset].name[x - strlen(keydesc) - 1] | attri);
+ mvwaddch(win->curses_win, y, x, keybindings[y + offset].name[x - strlen(keydesc) - 1] | attri);
else
- mvwaddch(win->curses_win, y + 1, x + win->border_left, ' ' | attri); }
- free(keydesc);
- if (y < height_av)
- for (; y < height_av; y++)
- for (x = 0; x < width_av; x++)
- mvwaddch(win->curses_win, y + 1, x + win->border_left, ' '); }
+ mvwaddch(win->curses_win, y, x, ' ' | attri); }
+ free(keydesc); }
void init_keybindings(struct World * world) {
// Initialize keybindings from file "keybindings".
@@ -228,15 +254,15 @@ void init_keybindings(struct World * world) {
struct KeyBinding * keybindings = malloc(lines * sizeof(struct KeyBinding));
fseek(file, 0, SEEK_SET);
char * command = malloc(linemax);
- char commcount = 0;
+ int commcount = 0;
char * digits = malloc(3);
- char digicount = 0;
+ int digicount = 0;
int key, digimax;
int keycount = 0;
c = getc(file);
while (EOF != c) {
if ('\n' == c) {
- keybindings[keycount].name = calloc(commcount, sizeof(char));
+ keybindings[keycount].name = calloc(commcount + 1, sizeof(char));
memcpy(keybindings[keycount].name, command, commcount);
keybindings[keycount].key = key;
keycount++;
@@ -294,7 +320,6 @@ int main () {
curs_set(0);
keypad(screen, TRUE);
raw();
-
struct WinMeta win_meta = init_win_meta(screen);
struct Win win_keys = init_window(&win_meta, "Keys");
@@ -318,9 +343,14 @@ int main () {
int key;
while (1) {
+ draw_all_windows (&win_meta);
key = getch();
if (key == get_action_key(world.keybindings, "quit"))
break;
+ else if (key == get_action_key(world.keybindings, "scroll pad right"))
+ win_meta.pad_offset++;
+ else if (key == get_action_key(world.keybindings, "scroll pad left") && win_meta.pad_offset > 0)
+ win_meta.pad_offset--;
else if (key == get_action_key(world.keybindings, "toggle keys window"))
toggle_window(&win_meta, &win_keys);
else if (key == get_action_key(world.keybindings, "toggle map window"))
@@ -337,66 +367,62 @@ int main () {
shift_window(&win_meta, 'f');
else if (key == get_action_key(world.keybindings, "shift backwards") && win_meta.active != 0)
shift_window(&win_meta, 'b');
- else if (key == get_action_key(world.keybindings, "grow hor") && win_meta.active != 0)
+ else if (key == get_action_key(world.keybindings, "grow horizontally") && win_meta.active != 0)
resize_window(&win_meta, '*');
- else if (key == get_action_key(world.keybindings, "shrink hor") && win_meta.active != 0)
+ else if (key == get_action_key(world.keybindings, "shrink horizontally") && win_meta.active != 0)
resize_window(&win_meta, '_');
- else if (key == get_action_key(world.keybindings, "grow ver") && win_meta.active != 0)
+ else if (key == get_action_key(world.keybindings, "grow vertically") && win_meta.active != 0)
resize_window(&win_meta, '+');
- else if (key == get_action_key(world.keybindings, "shrink ver") && win_meta.active != 0)
+ else if (key == get_action_key(world.keybindings, "shrink vertically") && win_meta.active != 0)
resize_window(&win_meta, '-');
else if (key == get_action_key(world.keybindings, "save keys"))
save_keybindings(&world);
- else if (key == get_action_key(world.keybindings, "keys nav up") && world.keyswindata->select > 0) {
+ 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."); } }
+
+ free(map.cells);
+ for (key = 0; key <= world.keyswindata->max; key++)
+ free(world.keybindings[key].name);
+ free(world.keybindings);
+ free(world.keyswindata);
+ free(win_info.data);
+ free(win_log.data);
endwin();
return 0; }