From a053b626309d3d9c51caecf35a018b6e1df5ecb5 Mon Sep 17 00:00:00 2001 From: Christian Heller Date: Sat, 25 Jan 2014 21:19:00 +0100 Subject: [PATCH] Client: Renamed some world members, commented world struct. --- src/client/command_db.c | 38 +++--- src/client/control.c | 4 +- src/client/draw_wins.c | 4 +- src/client/io.c | 2 +- src/client/keybindings.c | 2 +- src/client/main.c | 4 +- src/client/misc.c | 24 ++-- src/client/windows.c | 282 +++++++++++++++++++-------------------- src/client/windows.h | 8 +- src/client/world.h | 34 ++--- 10 files changed, 201 insertions(+), 201 deletions(-) diff --git a/src/client/command_db.c b/src/client/command_db.c index 159eb58..f5670a8 100644 --- a/src/client/command_db.c +++ b/src/client/command_db.c @@ -33,9 +33,9 @@ static void copy_tokenized_string(char * line, char ** ch_ptr, char * delim) extern struct Command * get_command(char * dsc_short) { - struct Command * cmd_ptr = world.cmd_db.cmds; + struct Command * cmd_ptr = world.commandDB.cmds; uint8_t i = 0; - while (i < world.cmd_db.n) + while (i < world.commandDB.n) { if (0 == strcmp(dsc_short, cmd_ptr->dsc_short)) { @@ -47,7 +47,7 @@ extern struct Command * get_command(char * dsc_short) char * err_start = "get_command_data() failed on request for: "; char err[strlen(err_start) + strlen(dsc_short) + 1]; sprintf(err, "%s%s", err_start, dsc_short); - exit_err(i == world.cmd_db.n, err); + exit_err(i == world.commandDB.n, err); return cmd_ptr; } @@ -61,7 +61,7 @@ extern void init_command_db() uint32_t lines; uint32_t linemax = textfile_sizes(file, &lines); char line[linemax + 1]; - world.cmd_db.cmds = try_malloc(lines * sizeof(struct Command), f_name); + world.commandDB.cmds = try_malloc(lines * sizeof(struct Command), f_name); uint8_t i = 0; char * delim = " "; while (try_fgets(line, linemax + 1, file, f_name)) @@ -70,20 +70,20 @@ extern void init_command_db() { break; } - copy_tokenized_string(line, &world.cmd_db.cmds[i].dsc_short, delim); - copy_tokenized_string(NULL, &world.cmd_db.cmds[i].server_msg, delim); - if (!strcmp("0", world.cmd_db.cmds[i].server_msg)) - { /* .server_msg==0 detects */ - free(world.cmd_db.cmds[i].server_msg); /* non-server commands in */ - world.cmd_db.cmds[i].server_msg = NULL;/* control.h's try_key() / */ - } /* try_server_command(). */ + copy_tokenized_string(line, &world.commandDB.cmds[i].dsc_short, delim); + copy_tokenized_string(NULL, &world.commandDB.cmds[i].server_msg, delim); + if (!strcmp("0", world.commandDB.cmds[i].server_msg)) + { /*.server_msg==0 detects*/ + free(world.commandDB.cmds[i].server_msg); /* non-server commands */ + world.commandDB.cmds[i].server_msg = NULL;/* in try_key() / */ + } /* try_server_command().*/ char * arg_string = strtok(NULL, delim); - world.cmd_db.cmds[i].arg = arg_string[0]; - copy_tokenized_string(NULL, &world.cmd_db.cmds[i].dsc_long, "\n"); + world.commandDB.cmds[i].arg = arg_string[0]; + copy_tokenized_string(NULL, &world.commandDB.cmds[i].dsc_long, "\n"); i++; } try_fclose(file, f_name); - world.cmd_db.n = lines; + world.commandDB.n = lines; set_cleanup_flag(CLEANUP_COMMANDS); } @@ -92,12 +92,12 @@ extern void init_command_db() extern void free_command_db() { uint8_t i = 0; - while (i < world.cmd_db.n) + while (i < world.commandDB.n) { - free(world.cmd_db.cmds[i].dsc_short); - free(world.cmd_db.cmds[i].dsc_long); - free(world.cmd_db.cmds[i].server_msg); + free(world.commandDB.cmds[i].dsc_short); + free(world.commandDB.cmds[i].dsc_long); + free(world.commandDB.cmds[i].server_msg); i++; } - free(world.cmd_db.cmds); + free(world.commandDB.cmds); } diff --git a/src/client/control.c b/src/client/control.c index 538f52c..b73d801 100644 --- a/src/client/control.c +++ b/src/client/control.c @@ -150,9 +150,9 @@ static uint8_t try_server_commands(struct Command * command) extern uint8_t try_key(uint16_t key) { struct Command * command = get_command_to_keycode(world.kb_global.kbs, key); - if (!command && world.windb.active) + if (!command && world.winDB.active) { - struct Win * w = get_win_by_id(world.windb.active); + struct Win * w = get_win_by_id(world.winDB.active); if (0 == w->view) { command = get_command_to_keycode(w->kb.kbs, key); diff --git a/src/client/draw_wins.c b/src/client/draw_wins.c index 54191f6..7cdb0b5 100644 --- a/src/client/draw_wins.c +++ b/src/client/draw_wins.c @@ -347,7 +347,7 @@ extern void draw_win_info(struct Win * win) sprintf(text, "%s%d%s%d%s%d", dsc_turn, world.turn, dsc_hitpoints, world.player_lifepoints, - dsc_score, world.score); + dsc_score, world.player_score); add_text_with_linebreaks(win, text); } @@ -384,7 +384,7 @@ extern void draw_win_available_keybindings(struct Win * win) { char * title = "Active window's keybindings:"; struct KeyBinding * kb_p; - struct Win * w = get_win_by_id(world.windb.active); + struct Win * w = get_win_by_id(world.winDB.active); if (0 == w->view) { kb_p = w->kb.kbs; diff --git a/src/client/io.c b/src/client/io.c index c2a3b4b..481495d 100644 --- a/src/client/io.c +++ b/src/client/io.c @@ -196,7 +196,7 @@ static uint8_t read_world() uint32_t linemax = textfile_sizes(file, NULL); char * read_buf = try_malloc(linemax + 1, f_name); world.turn = read_value_from_line(read_buf, linemax, file); - world.score = read_value_from_line(read_buf, linemax, file); + world.player_score = read_value_from_line(read_buf, linemax, file); world.player_lifepoints = read_value_from_line(read_buf, linemax, file); read_inventory(read_buf, linemax, file); world.player_pos.y = read_value_from_line(read_buf, linemax, file); diff --git a/src/client/keybindings.c b/src/client/keybindings.c index 2990419..857cd50 100644 --- a/src/client/keybindings.c +++ b/src/client/keybindings.c @@ -81,7 +81,7 @@ static struct KeyBindingDB * char_selected_kb_db(char c) } else if ('w' == c) { - struct Win * w = get_win_by_id(world.windb.active); + struct Win * w = get_win_by_id(world.winDB.active); kbd = &w->kb; } return kbd; diff --git a/src/client/main.c b/src/client/main.c index 2b6c18a..3abb44a 100644 --- a/src/client/main.c +++ b/src/client/main.c @@ -34,11 +34,11 @@ int main(int argc, char * argv[]) set_cleanup_func(cleanup); /* Initialize the whole interface. */ - world.windb.t_screen = initscr(); + world.winDB.t_screen = initscr(); set_cleanup_flag(CLEANUP_NCURSES); noecho(); curs_set(0); - keypad(world.windb.t_screen, TRUE); + keypad(world.winDB.t_screen, TRUE); init_command_db(); /* The command DB needs to be initialized before */ load_interface_conf(); /* the interface, whose keybindings depend on it. */ diff --git a/src/client/misc.c b/src/client/misc.c index 839ce36..a8cf053 100644 --- a/src/client/misc.c +++ b/src/client/misc.c @@ -16,7 +16,7 @@ * write_keybindings_to_file() */ #include "map_window.h" /* map_center() */ -#include "windows.h" /* for free_windb(), make_v_screen_and_init_win_sizes(), +#include "windows.h" /* for free_winDB(), make_v_screen_and_init_win_sizes(), * read_winconf_from_file(), write_winconf_of_id_to_file(), * toggle_window() */ @@ -55,9 +55,9 @@ extern void save_interface_conf() write_keybindings_to_file(file, &world.kb_winkeys, delim); write_order_wins_visible_active(file, delim); uint8_t i; - for (i = 0; i < strlen(world.windb.ids); i++) + for (i = 0; i < strlen(world.winDB.ids); i++) { - write_winconf_of_id_to_file(file, world.windb.ids[i], delim); + write_winconf_of_id_to_file(file, world.winDB.ids[i], delim); } try_fclose_unlink_rename(file, path_tmp, path, f_name); } @@ -82,12 +82,12 @@ extern void load_interface_conf() /* Build windows as defined by read interface data and toggle them on. */ make_v_screen_and_init_win_sizes(); uint8_t i; - char tmp_active = world.windb.active; - char tmp_order[strlen(world.windb.order) + 1]; - sprintf(tmp_order, "%s", world.windb.order); - world.windb.order[0] = '\0'; + char tmp_active = world.winDB.active; + char tmp_order[strlen(world.winDB.order) + 1]; + sprintf(tmp_order, "%s", world.winDB.order); + world.winDB.order[0] = '\0'; for (i = 0; i < strlen(tmp_order); toggle_window(tmp_order[i]), i++); - world.windb.active = tmp_active; + world.winDB.active = tmp_active; /* So that the interface config data and the window structs get freed. */ set_cleanup_flag(CLEANUP_INTERFACE); @@ -100,12 +100,12 @@ extern void unload_interface_conf() free_keybindings(world.kb_global.kbs); free_keybindings(world.kb_wingeom.kbs); free_keybindings(world.kb_winkeys.kbs); - while ('\0' != world.windb.active) + while ('\0' != world.winDB.active) { - toggle_window(world.windb.active); + toggle_window(world.winDB.active); } - free_windb(); - delwin(world.windb.v_screen); + free_winDB(); + delwin(world.winDB.v_screen); } diff --git a/src/client/windows.c b/src/client/windows.c index 6bde9ef..e5c691d 100644 --- a/src/client/windows.c +++ b/src/client/windows.c @@ -31,7 +31,7 @@ -/* Get position of id "c" in world.windb.order or return Win before/after (or +/* Get position of id "c" in world.winDB.order or return Win before/after (or * NULL if there is no window before/after). */ static uint8_t get_pos_in_order(char c); @@ -56,7 +56,7 @@ static void * get_drawfunc_by_char(char c); /* Write "win"'s size back to .target_(height/width) as per .target_*_type. */ static void set_win_target_size(struct Win * win); -/* Iterate over chars of world.windb.ids array / string. Restart after \0.*/ +/* Iterate over chars of world.winDB.ids array / string. Restart after \0.*/ static char get_next_win_id(); /* Make .v_screen just wide enough to contain all visible windows. */ @@ -100,15 +100,15 @@ static void draw_wins(struct Win * w); static void append_win(struct Win * w); static void suspend_win(struct Win * w); -/* Copy Win content pointed to by "win" into appendend world.windb.wins area. */ -static void add_win_to_windb(struct Win * win); +/* Copy Win content pointed to by "win" into appendend world.winDB.wins area. */ +static void add_win_to_winDB(struct Win * win); static uint8_t get_pos_in_order(char c) { uint8_t i; - for (i = 0; c != world.windb.order[i]; i++); + for (i = 0; c != world.winDB.order[i]; i++); return i; } @@ -116,7 +116,7 @@ static uint8_t get_pos_in_order(char c) static struct Win * get_win_after(char c) { - return get_win_by_id(world.windb.order[get_pos_in_order(c) + 1]); + return get_win_by_id(world.winDB.order[get_pos_in_order(c) + 1]); } @@ -126,7 +126,7 @@ static struct Win * get_win_before(char c) uint8_t i = get_pos_in_order(c); if (i > 0) { - return get_win_by_id(world.windb.order[i - 1]); + return get_win_by_id(world.winDB.order[i - 1]); } return NULL; } @@ -136,26 +136,26 @@ static struct Win * get_win_before(char c) static void init_win_size_from_winconf_and_v_screen_size(char id) { struct Win * w = get_win_by_id(id); - w->frame_size.y = world.windb.v_screen_size.y - 1; + w->frame_size.y = world.winDB.v_screen_size.y - 1; if ( 0 < w->target_height - && w->target_height <= world.windb.v_screen_size.y - 1) + && w->target_height <= world.winDB.v_screen_size.y - 1) { w->frame_size.y = w->target_height; } else if ( 0 > w->target_height - && world.windb.v_screen_size.y + (w->target_height - 1) > 0) + && world.winDB.v_screen_size.y + (w->target_height - 1) > 0) { - w->frame_size.y = world.windb.v_screen_size.y + (w->target_height - 1); + w->frame_size.y = world.winDB.v_screen_size.y + (w->target_height - 1); } - w->frame_size.x = world.windb.v_screen_size.x; + w->frame_size.x = world.winDB.v_screen_size.x; if (0 < w->target_width) { w->frame_size.x = w->target_width; } else if ( 0 > w->target_width - && world.windb.v_screen_size.x + w->target_width > 0) + && world.winDB.v_screen_size.x + w->target_width > 0) { - w->frame_size.x = world.windb.v_screen_size.x + w->target_width; + w->frame_size.x = world.winDB.v_screen_size.x + w->target_width; } } @@ -197,7 +197,7 @@ static void set_win_target_size(struct Win * wcp) } else if (1 == wcp->target_height_type) { - wcp->target_height = wcp->frame_size.y - world.windb.v_screen_size.y +1; + wcp->target_height = wcp->frame_size.y - world.winDB.v_screen_size.y +1; } if (0 == wcp->target_width_type) { @@ -205,7 +205,7 @@ static void set_win_target_size(struct Win * wcp) } else if (1 == wcp->target_width_type) { - wcp->target_width = wcp->frame_size.x - world.windb.v_screen_size.x; + wcp->target_width = wcp->frame_size.x - world.winDB.v_screen_size.x; } } @@ -214,7 +214,7 @@ static void set_win_target_size(struct Win * wcp) static char get_next_win_id() { static uint8_t i = 0; - char c = world.windb.ids[i]; + char c = world.winDB.ids[i]; if (0 == c) { i = 0; @@ -230,7 +230,7 @@ static void refit_v_screen() { /* Determine rightmost window column. */ uint32_t lastwcol = 0; - struct Win * wp = get_win_by_id(world.windb.order[0]); + struct Win * wp = get_win_by_id(world.winDB.order[0]); while (wp != 0) { if ((uint32_t) wp->start.x + (uint32_t) wp->frame_size.x > lastwcol + 1) @@ -243,11 +243,11 @@ static void refit_v_screen() /* Only resize .v_screen if the rightmost window column has changed. */ char * err_s = "refit_v_screen() grows virtual screen beyond legal sizes."; char * err_m = "refit_v_screen() triggers memory alloc error in wresize()."; - if (getmaxx(world.windb.v_screen) + 1 != lastwcol) + if (getmaxx(world.winDB.v_screen) + 1 != lastwcol) { uint8_t t = (lastwcol + 2 > UINT16_MAX); exit_err(t, err_s); - t = wresize(world.windb.v_screen, getmaxy(world.windb.v_screen), + t = wresize(world.winDB.v_screen, getmaxy(world.winDB.v_screen), lastwcol + 2); exit_err(t, err_m); } @@ -287,7 +287,7 @@ static void place_win(struct Win * w) /* Fit w's top left to bottom left of its ->prev if enough space. */ uint16_t w_prev_maxy = w_prev->start.y + w_prev->frame_size.y; if ( w->frame_size.x <= w_prev->frame_size.x - && w->frame_size.y < world.windb.v_screen_size.y - w_prev_maxy) + && w->frame_size.y < world.winDB.v_screen_size.y - w_prev_maxy) { w->start.x = w_prev->start.x; w->start.y = w_prev_maxy + 1; @@ -310,7 +310,7 @@ static void place_win(struct Win * w) uint16_t w_thr_bottom = w_thr->start.y + w_thr->frame_size.y; uint16_t free_width = (w_thr->start.x + w_thr->frame_size.x) - (w_test->start.x + w_test->frame_size.x); - if ( w->frame_size.y < world.windb.v_screen_size.y - w_thr_bottom + if ( w->frame_size.y < world.winDB.v_screen_size.y - w_thr_bottom && w->frame_size.x < free_width) { w->start.x = w_test->start.x + w_test->frame_size.x + 1; @@ -364,10 +364,10 @@ static void scroll_hint(struct yx_uint16 fsize, char dir, uint16_t dist, } if ('<' == dir || '>' == dir) { - mvwaddch(world.windb.v_screen, start.y+q, start.x+draw_offset, c); + mvwaddch(world.winDB.v_screen, start.y+q, start.x+draw_offset, c); continue; } - mvwaddch(world.windb.v_screen, start.y + draw_offset, start.x + q, c); + mvwaddch(world.winDB.v_screen, start.y + draw_offset, start.x + q, c); } } @@ -392,13 +392,13 @@ static void draw_win_borderlines(struct Win * w) uint16_t y, x; for (y = w->start.y; y <= w->start.y + w->frame_size.y; y++) { - mvwaddch(world.windb.v_screen, y, w->start.x - 1, '|'); - mvwaddch(world.windb.v_screen, y, w->start.x + w->frame_size.x, '|'); + mvwaddch(world.winDB.v_screen, y, w->start.x - 1, '|'); + mvwaddch(world.winDB.v_screen, y, w->start.x + w->frame_size.x, '|'); } for (x = w->start.x; x <= w->start.x + w->frame_size.x; x++) { - mvwaddch(world.windb.v_screen, w->start.y - 1, x, '-'); - mvwaddch(world.windb.v_screen, w->start.y + w->frame_size.y, x, '-'); + mvwaddch(world.winDB.v_screen, w->start.y - 1, x, '-'); + mvwaddch(world.winDB.v_screen, w->start.y + w->frame_size.y, x, '-'); } /* Draw as much as possible of the title into center of top border line. */ @@ -413,14 +413,14 @@ static void draw_win_borderlines(struct Win * w) uint16_t length_visible = strnlen(w->title, w->frame_size.x - 2); char title[length_visible + 3]; char decoration = ' '; - if (w->id == world.windb.active) + if (w->id == world.winDB.active) { decoration = '$'; } memcpy(title + 1, w->title, length_visible); title[0] = title[length_visible + 1] = decoration; title[length_visible + 2] = '\0'; - mvwaddstr(world.windb.v_screen, w->start.y-1, w->start.x+offset, title); + mvwaddstr(world.winDB.v_screen, w->start.y-1, w->start.x+offset, title); } } @@ -440,13 +440,13 @@ static void draw_wins_borderlines(struct Win * w) static void draw_wins_bordercorners(struct Win * w) { - mvwaddch(world.windb.v_screen, + mvwaddch(world.winDB.v_screen, w->start.y - 1, w->start.x - 1, '+'); - mvwaddch(world.windb.v_screen, + mvwaddch(world.winDB.v_screen, w->start.y - 1, w->start.x + w->frame_size.x, '+'); - mvwaddch(world.windb.v_screen, + mvwaddch(world.winDB.v_screen, w->start.y + w->frame_size.y, w->start.x - 1, '+'); - mvwaddch(world.windb.v_screen, w->start.y + w->frame_size.y, + mvwaddch(world.winDB.v_screen, w->start.y + w->frame_size.y, w->start.x + w->frame_size.x, '+'); struct Win * next = get_win_after(w->id); if (next) @@ -479,7 +479,7 @@ static void draw_wins(struct Win * w) for (x = offset_x; x < w->frame_size.x + offset_x && x < size_x; x++) { chtype ch = w->winmap[(y * w->winmap_size.x) + x]; - mvwaddch(world.windb.v_screen, w->start.y + (y - offset_y), + mvwaddch(world.winDB.v_screen, w->start.y + (y - offset_y), w->start.x + (x - offset_x), ch); } } @@ -514,14 +514,14 @@ static void draw_wins(struct Win * w) static void append_win(struct Win * w) { char * f_name = "append_win()"; - uint8_t old_size = strlen(world.windb.order) + 1; + uint8_t old_size = strlen(world.winDB.order) + 1; char * new_order = try_malloc(old_size + 1, f_name); - memcpy(new_order, world.windb.order, old_size - 1); + memcpy(new_order, world.winDB.order, old_size - 1); new_order[old_size - 1] = w->id; new_order[old_size] = '\0'; - free(world.windb.order); - world.windb.order = new_order; - world.windb.active = w->id; + free(world.winDB.order); + world.winDB.order = new_order; + world.winDB.active = w->id; update_wins(w); } @@ -530,21 +530,21 @@ static void append_win(struct Win * w) static void suspend_win(struct Win * w) { char * f_name = "suspend_win()"; - uint8_t new_size = strlen(world.windb.order); + uint8_t new_size = strlen(world.winDB.order); char * new_order = try_malloc(new_size, f_name); uint8_t i = get_pos_in_order(w->id); - char next_char = world.windb.order[i + 1]; - world.windb.order[i] = '\0'; - char * second_part = &world.windb.order[i + 1]; - sprintf(new_order, "%s%s", world.windb.order, second_part); - free(world.windb.order); - world.windb.order = new_order; - world.windb.active = world.windb.order[i]; - if (!world.windb.order[i] && 0 < i) + char next_char = world.winDB.order[i + 1]; + world.winDB.order[i] = '\0'; + char * second_part = &world.winDB.order[i + 1]; + sprintf(new_order, "%s%s", world.winDB.order, second_part); + free(world.winDB.order); + world.winDB.order = new_order; + world.winDB.active = world.winDB.order[i]; + if (!world.winDB.order[i] && 0 < i) { - world.windb.active = world.windb.order[i - 1]; + world.winDB.active = world.winDB.order[i - 1]; } - if (world.windb.order[i]) + if (world.winDB.order[i]) { update_wins(get_win_by_id(next_char)); /* Already calls */ return; /* refit_v_screen(), so leave. */ @@ -554,29 +554,29 @@ static void suspend_win(struct Win * w) -static void add_win_to_windb(struct Win * win) +static void add_win_to_winDB(struct Win * win) { - char * f_name = "add_win_to_windb()"; - if (world.windb.ids) + char * f_name = "add_win_to_winDB()"; + if (world.winDB.ids) { - uint8_t old_ids_size = strlen(world.windb.ids); + uint8_t old_ids_size = strlen(world.winDB.ids); char * new_ids = try_malloc(old_ids_size + 1 + 1, f_name); - sprintf(new_ids, "%s%c", world.windb.ids, win->id); - free(world.windb.ids); - world.windb.ids = new_ids; + sprintf(new_ids, "%s%c", world.winDB.ids, win->id); + free(world.winDB.ids); + world.winDB.ids = new_ids; uint16_t old_wins_size = old_ids_size * sizeof(struct Win); uint16_t new_wins_size = old_wins_size + sizeof(struct Win); struct Win * new_wins = try_malloc(new_wins_size, f_name); - memcpy(new_wins, world.windb.wins, old_wins_size); + memcpy(new_wins, world.winDB.wins, old_wins_size); new_wins[old_ids_size] = *win; - free(world.windb.wins); - world.windb.wins = new_wins; + free(world.winDB.wins); + world.winDB.wins = new_wins; return; } - world.windb.ids = try_malloc(2, f_name); - sprintf(world.windb.ids, "%c", win->id); - world.windb.wins = try_malloc(sizeof(struct Win), f_name); - world.windb.wins[0] = *win; + world.winDB.ids = try_malloc(2, f_name); + sprintf(world.winDB.ids, "%c", win->id); + world.winDB.wins = try_malloc(sizeof(struct Win), f_name); + world.winDB.wins[0] = *win; } @@ -607,11 +607,11 @@ extern uint16_t center_offset(uint16_t position, uint16_t mapsize, extern struct Win * get_win_by_id(char id) { uint8_t i = 0; - while ('\0' != world.windb.ids[i]) + while ('\0' != world.winDB.ids[i]) { - if (id == world.windb.ids[i]) + if (id == world.winDB.ids[i]) { - return &world.windb.wins[i]; + return &world.winDB.wins[i]; } i++; } @@ -644,7 +644,7 @@ extern uint8_t read_winconf_from_file(char * line, uint32_t linemax, win.target_width = atoi(line); win.target_width_type = (0 >= win.target_width); read_keybindings_from_file(line, linemax, file, &win.kb); - add_win_to_windb(&win); + add_win_to_winDB(&win); return 1; } @@ -680,12 +680,12 @@ extern void read_order_wins_visible_active(char * line, uint32_t linemax, char win_order[linemax + 1]; try_fgets(win_order, linemax + 1, file, f_name); win_order[strlen(win_order) - 1] = '\0'; - world.windb.order = try_malloc(strlen(win_order) + 1, f_name); - sprintf(world.windb.order, "%s", win_order); + world.winDB.order = try_malloc(strlen(win_order) + 1, f_name); + sprintf(world.winDB.order, "%s", win_order); int char_or_eof = try_fgetc(file, f_name); char * err_eof = "fgetc() unexpectedly hitting EOF"; exit_trouble(EOF == char_or_eof, f_name, err_eof); - world.windb.active = (uint8_t) char_or_eof; + world.winDB.active = (uint8_t) char_or_eof; exit_trouble(EOF == try_fgetc(file, f_name), f_name, err_eof); try_fgets(line, linemax + 1, file, f_name); } @@ -695,9 +695,9 @@ extern void read_order_wins_visible_active(char * line, uint32_t linemax, extern void write_order_wins_visible_active(FILE * file, char * delim) { char * f_name = "write_order_wins_visible_active()"; - try_fwrite(world.windb.order, strlen(world.windb.order), 1, file, f_name); + try_fwrite(world.winDB.order, strlen(world.winDB.order), 1, file, f_name); try_fputc('\n', file, f_name); - try_fputc(world.windb.active, file, f_name); + try_fputc(world.winDB.active, file, f_name); try_fputc('\n', file, f_name); try_fwrite(delim, strlen(delim), 1, file, f_name); } @@ -709,13 +709,13 @@ extern void make_v_screen_and_init_win_sizes() char * f_name = "make_v_screen_and_init_win_sizes()"; char * err_s = "creating an illegaly large virtual screen"; char * err_m = "triggering a memory allocation error via newpad()"; - uint32_t maxy_test = getmaxy(world.windb.t_screen); - uint32_t maxx_test = getmaxx(world.windb.t_screen); + uint32_t maxy_test = getmaxy(world.winDB.t_screen); + uint32_t maxx_test = getmaxx(world.winDB.t_screen); exit_trouble(maxy_test>UINT16_MAX || maxx_test>UINT16_MAX, f_name, err_s); - world.windb.v_screen_size.y = maxy_test; - world.windb.v_screen_size.x = maxx_test; - world.windb.v_screen = newpad(world.windb.v_screen_size.y, 1); - exit_trouble(NULL == world.windb.v_screen, f_name, err_m); + world.winDB.v_screen_size.y = maxy_test; + world.winDB.v_screen_size.x = maxx_test; + world.winDB.v_screen = newpad(world.winDB.v_screen_size.y, 1); + exit_trouble(NULL == world.winDB.v_screen, f_name, err_m); char id; while (0 != (id = get_next_win_id())) { @@ -725,7 +725,7 @@ extern void make_v_screen_and_init_win_sizes() -extern void free_windb() +extern void free_winDB() { char id; while (0 != (id = get_next_win_id())) @@ -734,10 +734,10 @@ extern void free_windb() free(wc->title); free_keybindings(wc->kb.kbs); } - free(world.windb.ids); /* NULL this too since add_win_to_windb() checks */ - world.windb.ids = NULL; /* for it to detect its first post-DB-purge round.*/ - free(world.windb.wins); - free(world.windb.order); + free(world.winDB.ids); /* NULL this too since add_win_to_winDB() checks */ + world.winDB.ids = NULL; /* for it to detect its first post-DB-purge round.*/ + free(world.winDB.wins); + free(world.winDB.order); } @@ -753,15 +753,15 @@ extern void reset_windows_on_winch() { endwin(); /* "[S]tandard way" to recalibrate ncurses post SIGWINCH, says */ refresh(); /* . */ - char tmp_order[strlen(world.windb.order) + 1]; - sprintf(tmp_order, "%s", world.windb.order); + char tmp_order[strlen(world.winDB.order) + 1]; + sprintf(tmp_order, "%s", world.winDB.order); uint8_t i; - char tmp_active = world.windb.active; + char tmp_active = world.winDB.active; for (i = 0; i < strlen(tmp_order); toggle_window(tmp_order[i]), i++); - delwin(world.windb.v_screen); + delwin(world.winDB.v_screen); make_v_screen_and_init_win_sizes(); for (i = 0; i < strlen(tmp_order); toggle_window(tmp_order[i]), i++); - world.windb.active = tmp_active; + world.winDB.active = tmp_active; } @@ -770,39 +770,39 @@ extern void draw_all_wins() { /* Empty everything before filling it a-new. */ erase(); - wnoutrefresh(world.windb.t_screen); - werase(world.windb.v_screen); - if (world.windb.active) + wnoutrefresh(world.winDB.t_screen); + werase(world.winDB.v_screen); + if (world.winDB.active) { /* Draw borders, wins. Order matters: corners should overwrite lines. */ - draw_wins_borderlines(get_win_by_id(world.windb.order[0])); - draw_wins_bordercorners(get_win_by_id(world.windb.order[0])); - draw_wins(get_win_by_id(world.windb.order[0])); + draw_wins_borderlines(get_win_by_id(world.winDB.order[0])); + draw_wins_bordercorners(get_win_by_id(world.winDB.order[0])); + draw_wins(get_win_by_id(world.winDB.order[0])); /* Draw .v_screen scroll hints. */ struct yx_uint16 start; start.y = 0; - start.x = world.windb.v_screen_offset; + start.x = world.winDB.v_screen_offset; char * cols_string = "columns"; - if (world.windb.v_screen_offset > 0) + if (world.winDB.v_screen_offset > 0) { - scroll_hint(world.windb.v_screen_size, '<', - world.windb.v_screen_offset + 1, cols_string, start); + scroll_hint(world.winDB.v_screen_size, '<', + world.winDB.v_screen_offset + 1, cols_string, start); } - uint16_t size_x = getmaxx(world.windb.v_screen); - uint16_t right_edge = world.windb.v_screen_offset - + world.windb.v_screen_size.x; + uint16_t size_x = getmaxx(world.winDB.v_screen); + uint16_t right_edge = world.winDB.v_screen_offset + + world.winDB.v_screen_size.x; if (right_edge < size_x - 1) { - scroll_hint(world.windb.v_screen_size, '>', + scroll_hint(world.winDB.v_screen_size, '>', size_x - right_edge, cols_string, start); } /* Put .v_screen segment to be shown on .t_screen to .t_screen buffer.*/ - pnoutrefresh(world.windb.v_screen, 0, world.windb.v_screen_offset, 0, 0, - world.windb.v_screen_size.y, - world.windb.v_screen_size.x - 1); + pnoutrefresh(world.winDB.v_screen, 0, world.winDB.v_screen_offset, 0, 0, + world.winDB.v_screen_size.y, + world.winDB.v_screen_size.x - 1); } /* Only at the end write accumulated changes to .t_screen. */ @@ -814,7 +814,7 @@ extern void draw_all_wins() extern void toggle_window(char id) { struct Win * win = get_win_by_id(id); - if (NULL == strchr(world.windb.order, id)) + if (NULL == strchr(world.winDB.order, id)) { append_win(win); return; @@ -826,11 +826,11 @@ extern void toggle_window(char id) extern void toggle_winconfig() { - if (!world.windb.active) + if (!world.winDB.active) { return; } - struct Win * w = get_win_by_id(world.windb.active); + struct Win * w = get_win_by_id(world.winDB.active); if (0 == w->view) { w->view = 1; @@ -852,7 +852,7 @@ extern void toggle_winconfig() extern void toggle_win_size_type(char axis) { - struct Win * w = get_win_by_id(world.windb.active); + struct Win * w = get_win_by_id(world.winDB.active); if ('y' == axis) { w->target_height_type = (0 == w->target_height_type); @@ -860,7 +860,7 @@ extern void toggle_win_size_type(char axis) return; } w->target_width_type = ( 0 == w->target_width_type - && w->frame_size.x <= world.windb.v_screen_size.x); + && w->frame_size.x <= world.winDB.v_screen_size.x); set_win_target_size(w); } @@ -868,9 +868,9 @@ extern void toggle_win_size_type(char axis) extern void resize_active_win(char change) { - if (world.windb.active) + if (world.winDB.active) { - struct Win * w = get_win_by_id(world.windb.active); + struct Win * w = get_win_by_id(world.winDB.active); if (change == '-' && w->frame_size.y > 1) { w->frame_size.y--; @@ -880,7 +880,7 @@ extern void resize_active_win(char change) w->frame_size.x--; } else if ( change == '+' - && w->frame_size.y < world.windb.v_screen_size.y - 1) + && w->frame_size.y < world.winDB.v_screen_size.y - 1) { w->frame_size.y++; } @@ -889,7 +889,7 @@ extern void resize_active_win(char change) w->frame_size.x++; } if ( 1 == w->target_width_type - && w->frame_size.x > world.windb.v_screen_size.x) + && w->frame_size.x > world.winDB.v_screen_size.x) { w->target_width_type = 0; } @@ -902,41 +902,41 @@ extern void resize_active_win(char change) extern void shift_active_win(char dir) { - uint8_t len_order = strlen(world.windb.order); + uint8_t len_order = strlen(world.winDB.order); if (1 < len_order) { char tmp[len_order + 1]; tmp[len_order] = '\0'; - uint8_t pos = get_pos_in_order(world.windb.active); + uint8_t pos = get_pos_in_order(world.winDB.active); if ('f' == dir) { if (pos == len_order - 1) { - memcpy(tmp + 1, world.windb.order, len_order - 1); - tmp[0] = world.windb.active; - memcpy(world.windb.order, tmp, len_order + 1); + memcpy(tmp + 1, world.winDB.order, len_order - 1); + tmp[0] = world.winDB.active; + memcpy(world.winDB.order, tmp, len_order + 1); } else { - world.windb.order[pos] = world.windb.order[pos + 1]; - world.windb.order[pos + 1] = world.windb.active; + world.winDB.order[pos] = world.winDB.order[pos + 1]; + world.winDB.order[pos + 1] = world.winDB.active; } } else { if (pos == 0) { - memcpy(tmp, world.windb.order + 1, len_order - 1); - tmp[len_order - 1] = world.windb.active; - memcpy(world.windb.order, tmp, len_order + 1); + memcpy(tmp, world.winDB.order + 1, len_order - 1); + tmp[len_order - 1] = world.winDB.active; + memcpy(world.winDB.order, tmp, len_order + 1); } else { - world.windb.order[pos] = world.windb.order[pos - 1]; - world.windb.order[pos - 1] = world.windb.active; + world.winDB.order[pos] = world.winDB.order[pos - 1]; + world.winDB.order[pos - 1] = world.winDB.active; } } - update_wins(get_win_by_id(world.windb.order[0])); + update_wins(get_win_by_id(world.winDB.order[0])); } } @@ -945,15 +945,15 @@ extern void shift_active_win(char dir) extern void scroll_v_screen(char dir) { if ( '+' == dir - && world.windb.v_screen_offset + world.windb.v_screen_size.x + 1 - < getmaxx(world.windb.v_screen)) + && world.winDB.v_screen_offset + world.winDB.v_screen_size.x + 1 + < getmaxx(world.winDB.v_screen)) { - world.windb.v_screen_offset++; + world.winDB.v_screen_offset++; } else if ( '-' == dir - && world.windb.v_screen_offset > 0) + && world.winDB.v_screen_offset > 0) { - world.windb.v_screen_offset--; + world.winDB.v_screen_offset--; } } @@ -961,24 +961,24 @@ extern void scroll_v_screen(char dir) extern void cycle_active_win(char dir) { - uint8_t len_order = strlen(world.windb.order); + uint8_t len_order = strlen(world.winDB.order); if (1 < len_order) { - uint8_t pos = get_pos_in_order(world.windb.active); + uint8_t pos = get_pos_in_order(world.winDB.active); if ('f' == dir) { - world.windb.active = world.windb.order[pos + 1]; - if ('\0' == world.windb.active) + world.winDB.active = world.winDB.order[pos + 1]; + if ('\0' == world.winDB.active) { - world.windb.active = world.windb.order[0]; + world.winDB.active = world.winDB.order[0]; } return; } if (pos > 0) { - world.windb.active = world.windb.order[pos - 1]; + world.winDB.active = world.winDB.order[pos - 1]; return; } - world.windb.active = world.windb.order[len_order - 1]; + world.winDB.active = world.winDB.order[len_order - 1]; } } diff --git a/src/client/windows.h b/src/client/windows.h index d8da5be..59cf64d 100644 --- a/src/client/windows.h +++ b/src/client/windows.h @@ -70,8 +70,8 @@ extern uint16_t center_offset(uint16_t position, /* Get Win of "id". */ extern struct Win * get_win_by_id(char id); -/* Read/write individual Win (identified by "c") and world.windb.order / - * world.windb.active from/to "file". Follow writing with "delim" delimiter. +/* Read/write individual Win (identified by "c") and world.winDB.order / + * world.winDB.active from/to "file". Follow writing with "delim" delimiter. * Use "line" and "linemax" as expected by try_fgets(). */ extern uint8_t read_winconf_from_file(char * line, uint32_t linemax, @@ -84,8 +84,8 @@ extern void write_order_wins_visible_active(FILE * file, char * delim); /* Builds virtual sreen from .t_screen's size, fits win's sizes to them.*/ extern void make_v_screen_and_init_win_sizes(); -/* Free all WinDB data. */ -extern void free_windb(); +/* Free all winDB data. */ +extern void free_winDB(); /* The SIGWINCH handler winch_called() merely sets world.winch to 1. This info * is used by io_loop() to call reset_windows_on_winch(), which adapts the diff --git a/src/client/world.h b/src/client/world.h index 9e07efa..8b49a29 100644 --- a/src/client/world.h +++ b/src/client/world.h @@ -18,23 +18,23 @@ struct World { - struct WinDB windb; - struct CommandDB cmd_db; /* Command database. */ - struct KeyBindingDB kb_global; /* Global keybindings. */ - struct KeyBindingDB kb_wingeom; /* Window geometry config keybindings. */ - struct KeyBindingDB kb_winkeys; /* Window keybinding config keybindings.*/ - struct Map map; /* Pointer to the game map cells. */ - time_t last_update; - struct yx_uint16 player_pos; - char * log; - char * path_server_in; - char * path_interface_conf; - char * player_inventory; - uint16_t turn; - uint16_t score; - uint8_t halfdelay; - uint8_t player_inventory_select; - uint8_t player_lifepoints; + struct WinDB winDB; /* data for window management and individual windows */ + struct CommandDB commandDB; /* data on commands from commands config file */ + struct KeyBindingDB kb_global; /* globally availabe keybindings */ + struct KeyBindingDB kb_wingeom; /* Win geometry config view keybindings */ + struct KeyBindingDB kb_winkeys; /* Win keybindings config view keybindings*/ + struct Map map; /* game map geometry and content */ + time_t last_update; /* used for comparison with server outfile' mtime */ + struct yx_uint16 player_pos; /* coordinates of player on map */ + char * log; /* log of player's activities */ + char * path_server_in; /* path of server's input fifo */ + char * path_interface_conf; /* path of interface configuration file */ + char * player_inventory; /* one-item-per-line string list of owned items */ + uint16_t turn; /* world/game turn */ + uint16_t player_score; /* player's score*/ + uint8_t halfdelay; /* how long to wait for getch() input in io_loop() */ + uint8_t player_inventory_select; /* index of selected item in inventory */ + uint8_t player_lifepoints; /* how alive the player is */ uint8_t winch; /* if set, SIGWINCH was registered; trigger reset_windows()*/ }; -- 2.30.2