From: Christian Heller Date: Sat, 15 Jun 2013 01:21:22 +0000 (+0200) Subject: More consistency in shortening names. X-Git-Tag: tce~1220 X-Git-Url: https://plomlompom.com/repos/%7B%7B%20web_path%20%7D%7D/decks/%7B%7Bdeck_id%7D%7D/bar%20baz.html?a=commitdiff_plain;h=02b0be5f5500784e03d060fad82746da00e78edc;p=plomrogue More consistency in shortening names. --- diff --git a/keybindings.c b/keybindings.c index 3e1b19a..b6ff412 100644 --- a/keybindings.c +++ b/keybindings.c @@ -113,7 +113,7 @@ char * get_keyname(uint16_t keycode) { void keyswin_mod_key (struct World * world, struct WinMeta * win_meta) { // In keybindings window, mark selection modifiable, modify key. Ensure max of three digits in key code field. world->keyswindata->edit = 1; - draw_all_windows (win_meta); + draw_all_wins (win_meta); int key = getch(); if (key < 1000) world->keybindings[world->keyswindata->select].key = key; diff --git a/roguelike.c b/roguelike.c index 9b858f3..2bab85f 100644 --- a/roguelike.c +++ b/roguelike.c @@ -68,9 +68,9 @@ void save_game(struct World * world) { void toggle_window (struct WinMeta * win_meta, struct Win * win) { // Toggle display of window win. if (0 != win->frame.curses_win) - suspend_window(win_meta, win); + suspend_win(win_meta, win); else - append_window(win_meta, win); } + append_win(win_meta, win); } void scroll_pad (struct WinMeta * win_meta, char dir) { // Try to scroll pad left or right. @@ -92,7 +92,7 @@ void growshrink_active_window (struct WinMeta * win_meta, char change) { width--; else if (change == '*') width++; - resize_active_window (win_meta, height, width); } } + resize_active_win (win_meta, height, width); } } struct Map init_map () { // Initialize map with some experimental start values. @@ -248,13 +248,13 @@ unsigned char meta_keys(int key, struct World * world, struct WinMeta * win_meta else if (key == get_action_key(world->keybindings, "toggle log window")) toggle_window(win_meta, win_log); else if (key == get_action_key(world->keybindings, "cycle forwards")) - cycle_active_window(win_meta, 'n'); + cycle_active_win(win_meta, 'n'); else if (key == get_action_key(world->keybindings, "cycle backwards")) - cycle_active_window(win_meta, 'p'); + cycle_active_win(win_meta, 'p'); else if (key == get_action_key(world->keybindings, "shift forwards")) - shift_active_window(win_meta, 'f'); + shift_active_win(win_meta, 'f'); else if (key == get_action_key(world->keybindings, "shift backwards")) - shift_active_window(win_meta, 'b'); + shift_active_win(win_meta, 'b'); else if (key == get_action_key(world->keybindings, "grow horizontally")) growshrink_active_window(win_meta, '*'); else if (key == get_action_key(world->keybindings, "shrink horizontally")) @@ -341,10 +341,10 @@ int main (int argc, char *argv[]) { raw(); init_keybindings(&world); struct WinMeta win_meta = init_win_meta(screen); - struct Win win_keys = init_window(&win_meta, "Keys", &world, draw_keys_win); - struct Win win_map = init_window(&win_meta, "Map", &world, draw_map_win); - struct Win win_info = init_window(&win_meta, "Info", &world, draw_info_win); - struct Win win_log = init_window(&win_meta, "Log", &world, draw_log_win); + struct Win win_keys = init_win(&win_meta, "Keys", &world, draw_keys_win); + struct Win win_map = init_win(&win_meta, "Map", &world, draw_map_win); + struct Win win_info = init_win(&win_meta, "Info", &world, draw_info_win); + struct Win win_log = init_win(&win_meta, "Log", &world, draw_log_win); win_keys.frame.size.x = 29; win_map.frame.size.x = win_meta.pad.size.x - win_keys.frame.size.x - win_log.frame.size.x - 2; win_info.frame.size.y = 1; @@ -363,7 +363,7 @@ int main (int argc, char *argv[]) { if (start_turn == world.turn) start_turn = 0; if (0 == start_turn) { - draw_all_windows (&win_meta); + draw_all_wins (&win_meta); key = getch(); } if (1 == still_reading_file && (world.turn < start_turn || key == get_action_key(world.keybindings, "wait / next turn")) ) { @@ -391,7 +391,7 @@ int main (int argc, char *argv[]) { if (last_turn != world.turn) { save_game(&world); last_turn = world.turn; } - draw_all_windows (&win_meta); + draw_all_wins (&win_meta); key = getch(); if (key == get_action_key(world.keybindings, "player down")) move_player(&world, 's'); diff --git a/windows.c b/windows.c index f2315d9..e25a5e2 100644 --- a/windows.c +++ b/windows.c @@ -11,85 +11,85 @@ struct Corners { struct yx_uint16 br; }; static void refit_pad (struct WinMeta *); -static void place_window (struct WinMeta *, struct Win *); -static void update_windows (struct WinMeta *, struct Win *); -static void destroy_window (struct Win *); +static void place_win (struct WinMeta *, struct Win *); +static void update_wins (struct WinMeta *, struct Win *); +static void destroy_win (struct Win *); static void draw_wins_borders (struct Win *, struct Win *, struct Corners *, uint16_t); static void draw_win_borders (struct Win *, char); -static void draw_windows (struct Win *); +static void draw_wins (struct Win *); extern struct WinMeta init_win_meta (WINDOW * screen) { // Create and populate WinMeta struct with sane default values. - struct WinMeta win_meta; - win_meta.screen = screen; - win_meta.pad.size.y = getmaxy(screen); - win_meta.pad.size.x = getmaxx(screen); - win_meta.chain_start = 0; - win_meta.chain_end = 0; - win_meta.pad_offset = 0; - win_meta.pad.curses_win = newpad(win_meta.pad.size.y, 1); - win_meta.active = 0; - return win_meta; } + struct WinMeta wmeta; + wmeta.screen = screen; + wmeta.pad.size.y = getmaxy(screen); + wmeta.pad.size.x = getmaxx(screen); + wmeta.chain_start = 0; + wmeta.chain_end = 0; + wmeta.pad_offset = 0; + wmeta.pad.curses_win = newpad(wmeta.pad.size.y, 1); + wmeta.active = 0; + return wmeta; } -extern struct Win init_window (struct WinMeta * win_meta, char * title, void * data, void * func) { +extern struct Win init_win (struct WinMeta * wmeta, char * title, void * data, void * func) { // Create and populate Win struct with sane default values. - struct Win win; - win.prev = 0; - win.next = 0; - win.frame.curses_win = 0; - win.title = title; - win.frame.size.x = 20; - win.frame.size.y = win_meta->pad.size.y - 1; - win.data = data; - win.draw = func; - return win; } + struct Win w; + w.prev = 0; + w.next = 0; + w.frame.curses_win = 0; + w.title = title; + w.frame.size.x = 20; + w.frame.size.y = wmeta->pad.size.y - 1; + w.data = data; + w.draw = func; + return w; } -extern void append_window (struct WinMeta * win_meta, struct Win * win) { +extern void append_win (struct WinMeta * wmeta, struct Win * w) { // Append win to window chain. Set active, if first window. Update geometry of windows from new window on. - if (0 != win_meta->chain_start) { - win->prev = win_meta->chain_end; - win_meta->chain_end->next = win; } + if (0 != wmeta->chain_start) { + w->prev = wmeta->chain_end; + wmeta->chain_end->next = w; } else { - win_meta->active = win; - win_meta->chain_start = win; } - win_meta->chain_end = win; - update_windows(win_meta, win); } + wmeta->active = w; + wmeta->chain_start = w; } + wmeta->chain_end = w; + update_wins(wmeta, w); } -static void refit_pad (struct WinMeta * win_meta) { +static void refit_pad (struct WinMeta * wmeta) { // Fit pad width to minimum width demanded by current windows' geometries. uint16_t lastwincol = 0; - struct Win * win_p = win_meta->chain_start; - while (win_p != 0) { - if (win_p->start.x + win_p->frame.size.x > lastwincol + 1) - lastwincol = win_p->start.x + win_p->frame.size.x - 1; - win_p = win_p->next; } - if (getmaxx(win_meta->pad.curses_win) != lastwincol) - wresize(win_meta->pad.curses_win, getmaxy(win_meta->pad.curses_win), lastwincol + 2); } + struct Win * w_p = wmeta->chain_start; + while (w_p != 0) { + if (w_p->start.x + w_p->frame.size.x > lastwincol + 1) + lastwincol = w_p->start.x + w_p->frame.size.x - 1; + w_p = w_p->next; } + if (getmaxx(wmeta->pad.curses_win) != lastwincol) + wresize(wmeta->pad.curses_win, getmaxy(wmeta->pad.curses_win), lastwincol + 2); } -extern void suspend_window (struct WinMeta * win_meta, struct Win * win) { +extern void suspend_win (struct WinMeta * wmeta, struct Win * w) { // Destroy win, suspend from chain. Update geometry of following rows and pad, as well as activity selection. - destroy_window(win); - if (win_meta->chain_start != win) // Give win's position in the chain to element next to it in the chain. - win->prev->next = win->next; + destroy_win(w); + if (wmeta->chain_start != w) // Give win's position in the chain to element next to it in the chain. + w->prev->next = w->next; else - win_meta->chain_start = win->next; + wmeta->chain_start = w->next; char pad_refitted = 0; - if (win_meta->chain_end != win) { // Let chain element next to win know its new predecessor. - win->next->prev = win->prev; - if (win_meta->active == win) // If win was active, shift active window pointer to - win_meta->active = win->next; // the next chain element, if that is a window ... - update_windows(win_meta, win->next); + if (wmeta->chain_end != w) { // Let chain element next to win know its new predecessor. + w->next->prev = w->prev; + if (wmeta->active == w) // If win was active, shift active window pointer to + wmeta->active = w->next; // the next chain element, if that is a window ... + update_wins(wmeta, w->next); pad_refitted = 1; } else { - win_meta->chain_end = win->prev; - if (win_meta->active == win) // ... or else to the previous element. - win_meta->active = win->prev; } - win->prev = 0; - win->next = 0; + wmeta->chain_end = w->prev; + if (wmeta->active == w) // ... or else to the previous element. + wmeta->active = w->prev; } + w->prev = 0; + w->next = 0; if (0 == pad_refitted) // Refit pad if necessary. - refit_pad(win_meta); } + refit_pad(wmeta); } -static void place_window (struct WinMeta * win_meta, struct Win * w) { +static void place_win (struct WinMeta * wmeta, struct Win * w) { // Based on position and sizes of previous window, find fitting place for current window. w->start.x = 0; // if window is first in chain, place it on top-left corner w->start.y = 1; @@ -99,7 +99,7 @@ static void place_window (struct WinMeta * win_meta, struct Win * w) { w_top = w_top->prev; // else, default to placing window in new top w->start.x = w_top->start.x + w_top->frame.size.x + 1; // column to the right of the last one uint16_t w_prev_maxy = w->prev->start.y + getmaxy(w->prev->frame.curses_win); - if (w->frame.size.x <= w->prev->frame.size.x && w->frame.size.y < win_meta->pad.size.y - w_prev_maxy) { + if (w->frame.size.x <= w->prev->frame.size.x && w->frame.size.y < wmeta->pad.size.y - w_prev_maxy) { w->start.x = w->prev->start.x; // place window below previous window if it fits w->start.y = w_prev_maxy + 1; } // vertically and is not wider than its predecessor else { @@ -114,50 +114,50 @@ static void place_window (struct WinMeta * win_meta, struct Win * w) { w_upup = w_upup->prev; } w_prev_maxy = w_upup->start.y + getmaxy(w_upup->frame.curses_win); widthdiff = (w_upup->start.x + w_upup->frame.size.x) - (w_up->start.x + w_up->frame.size.x); - if (w->frame.size.y < win_meta->pad.size.y - w_prev_maxy && w->frame.size.x < widthdiff) { + if (w->frame.size.y < wmeta->pad.size.y - w_prev_maxy && w->frame.size.x < widthdiff) { w->start.x = w_up->start.x + w_up->frame.size.x + 1 ; // else try to open new sub column under w->start.y = w_prev_maxy + 1; // last window below which enough space remains break; } w_up = w_upup; } } } } -static void update_windows (struct WinMeta * wmeta, struct Win * w) { +static void update_wins (struct WinMeta * wmeta, struct Win * w) { // Update geometry of win and its next of kin. Destroy (if visible), (re-)build window. If need, resize pad. if (0 != w->frame.curses_win) - destroy_window (w); - place_window(wmeta, w); + destroy_win (w); + place_win(wmeta, w); refit_pad(wmeta); w->frame.curses_win=subpad(wmeta->pad.curses_win, w->frame.size.y, w->frame.size.x, w->start.y, w->start.x); if (0 != w->next) - update_windows (wmeta, w->next); } + update_wins (wmeta, w->next); } -static void destroy_window (struct Win * win) { +static void destroy_win (struct Win * w) { // Delete window. - delwin(win->frame.curses_win); - win->frame.curses_win = 0; } + delwin(w->frame.curses_win); + w->frame.curses_win = 0; } -static void draw_win_borders (struct Win * win, char active) { +static void draw_win_borders (struct Win * w, char active) { // Draw borders of window win, including title. Decorate in a special way if window is marked as active. uint16_t y, x; - for (y = win->start.y; y <= win->start.y + win->frame.size.y; y++) { - mvwaddch(wgetparent(win->frame.curses_win), y, win->start.x - 1, '|'); - mvwaddch(wgetparent(win->frame.curses_win), y, win->start.x + win->frame.size.x, '|'); } - for (x = win->start.x; x <= win->start.x + win->frame.size.x; x++) { - mvwaddch(wgetparent(win->frame.curses_win), win->start.y - 1, x, '-'); - mvwaddch(wgetparent(win->frame.curses_win), win->start.y + win->frame.size.y, x, '-'); } + for (y = w->start.y; y <= w->start.y + w->frame.size.y; y++) { + mvwaddch(wgetparent(w->frame.curses_win), y, w->start.x - 1, '|'); + mvwaddch(wgetparent(w->frame.curses_win), y, w->start.x + w->frame.size.x, '|'); } + for (x = w->start.x; x <= w->start.x + w->frame.size.x; x++) { + mvwaddch(wgetparent(w->frame.curses_win), w->start.y - 1, x, '-'); + mvwaddch(wgetparent(w->frame.curses_win), w->start.y + w->frame.size.y, x, '-'); } char min_title_length_visible = 3; // 1 char minimal, plus 2 chars for decoration left/right of title - if (win->frame.size.x >= min_title_length_visible) { + if (w->frame.size.x >= min_title_length_visible) { uint16_t title_offset = 0; - if (win->frame.size.x > strlen(win->title) + 2) - title_offset = (win->frame.size.x - (strlen(win->title) + 2)) / 2; // + 2 is for decoration - uint16_t length_visible = strnlen(win->title, win->frame.size.x - 2); + if (w->frame.size.x > strlen(w->title) + 2) + title_offset = (w->frame.size.x - (strlen(w->title) + 2)) / 2; // + 2 is for decoration + uint16_t length_visible = strnlen(w->title, w->frame.size.x - 2); char title[length_visible + 3]; char decoration = ' '; if (1 == active) decoration = '$'; - memcpy(title + 1, win->title, length_visible); + memcpy(title + 1, w->title, length_visible); title[0] = title[length_visible + 1] = decoration; title[length_visible + 2] = '\0'; - mvwaddstr(wgetparent(win->frame.curses_win), win->start.y - 1, win->start.x + title_offset, title); } } + mvwaddstr(wgetparent(w->frame.curses_win), w->start.y - 1, w->start.x + title_offset, title); } } static void draw_wins_borders (struct Win * w, struct Win * w_active, struct Corners * corners, uint16_t i) { // Call draw_win_borders() for all windows in chain from win on. Save current window's border corners. @@ -176,11 +176,11 @@ static void draw_wins_borders (struct Win * w, struct Win * w_active, struct Cor if (0 != w->next) { draw_wins_borders (w->next, w_active, corners, i + 1); } } -static void draw_windows (struct Win * win) { +static void draw_wins (struct Win * w) { // Draw contents of all windows in window chain from win on. - win->draw(win); - if (0 != win->next) { - draw_windows (win->next); } } + w->draw(w); + if (0 != w->next) { + draw_wins (w->next); } } extern void draw_scroll_hint (struct Frame * frame, uint16_t pos, uint32_t dist, char dir) { // Draw scroll hint into frame at pos (row or col dependend on dir), mark distance of dist cells into dir. @@ -209,7 +209,7 @@ extern void draw_scroll_hint (struct Frame * frame, uint16_t pos, uint32_t dist, mvwaddch(frame->curses_win, pos, q, symbol); } free(scrolldsc); } -extern void draw_all_windows (struct WinMeta * wmeta) { +extern void draw_all_wins (struct WinMeta * wmeta) { // Draw pad with all windows and their borders, plus scrolling hints. erase(); wnoutrefresh(wmeta->screen); @@ -221,7 +221,7 @@ extern void draw_all_windows (struct WinMeta * wmeta) { win_p = win_p->next; n_wins++; } struct Corners * all_corners = malloc(sizeof(struct Corners) * n_wins); - draw_windows (wmeta->chain_start); + draw_wins (wmeta->chain_start); draw_wins_borders (wmeta->chain_start, wmeta->active, all_corners, 0); for (i = 0; i < n_wins; i++) { mvwaddch(wmeta->pad.curses_win, all_corners[i].tl.y, all_corners[i].tl.x, '+'); @@ -237,65 +237,65 @@ extern void draw_all_windows (struct WinMeta * wmeta) { pnoutrefresh(wmeta->pad.curses_win, 0, wmeta->pad_offset, 0, 0, wmeta->pad.size.y, wmeta->pad.size.x-1); } doupdate(); } -extern void resize_active_window (struct WinMeta * win_meta, uint16_t height, uint16_t width) { +extern void resize_active_win (struct WinMeta * wmeta, uint16_t height, uint16_t width) { // Grow or shrink currently active window. Correct its geometry and that of its followers. - if (0 != win_meta->active && width > 0 && height > 0 && height < win_meta->pad.size.y) { - win_meta->active->frame.size.y = height; - win_meta->active->frame.size.x = width; - update_windows(win_meta, win_meta->chain_start); } } + if (0 != wmeta->active && width > 0 && height > 0 && height < wmeta->pad.size.y) { + wmeta->active->frame.size.y = height; + wmeta->active->frame.size.x = width; + update_wins(wmeta, wmeta->chain_start); } } -extern void cycle_active_window (struct WinMeta * win_meta, char dir) { +extern void cycle_active_win (struct WinMeta * wmeta, char dir) { // Cycle active window selection forwards (dir = 'n') or backwards. - if (0 != win_meta->active) { + if (0 != wmeta->active) { if ('n' == dir) { - if (win_meta->active->next != 0) - win_meta->active = win_meta->active->next; + if (wmeta->active->next != 0) + wmeta->active = wmeta->active->next; else - win_meta->active = win_meta->chain_start; } + wmeta->active = wmeta->chain_start; } else { - if (win_meta->active->prev != 0) - win_meta->active = win_meta->active->prev; + if (wmeta->active->prev != 0) + wmeta->active = wmeta->active->prev; else - win_meta->active = win_meta->chain_end; } } } + wmeta->active = wmeta->chain_end; } } } -extern void shift_active_window (struct WinMeta * win_meta, char dir) { +extern void shift_active_win (struct WinMeta * wmeta, char dir) { // Move active window forward/backward in window chain. If jumping beyond start/end, move to other chain end. - if (0 != win_meta->active && win_meta->chain_start != win_meta->chain_end && (dir == 'f' || dir == 'b')) { - struct Win * win_shift = win_meta->active, * win_p, * win_p_next; + if (0 != wmeta->active && wmeta->chain_start != wmeta->chain_end && (dir == 'f' || dir == 'b')) { + struct Win * w_shift = wmeta->active, * w_p, * w_p_next; char wrap = 0; - if ((dir == 'f' && win_shift == win_meta->chain_end) - || (dir == 'b' && win_shift == win_meta->chain_start)) + if ((dir == 'f' && w_shift == wmeta->chain_end) + || (dir == 'b' && w_shift == wmeta->chain_start)) wrap = 1; uint16_t i, i_max; - for (i_max = 1, win_p = win_meta->chain_start; win_p != win_meta->chain_end; i_max++) - win_p = win_p->next; + for (i_max = 1, w_p = wmeta->chain_start; w_p != wmeta->chain_end; i_max++) + w_p = w_p->next; struct Win ** wins = malloc(i_max * sizeof(struct Win *)); - for (i = 0, win_p = win_meta->chain_start; i < i_max; i++) { - win_p_next = win_p->next; - suspend_window(win_meta, win_p); - wins[i] = win_p; - win_p = win_p_next; } + for (i = 0, w_p = wmeta->chain_start; i < i_max; i++) { + w_p_next = w_p->next; + suspend_win(wmeta, w_p); + wins[i] = w_p; + w_p = w_p_next; } if (wrap) if (dir == 'f') { - append_window(win_meta, win_shift); + append_win(wmeta, w_shift); for (i = 0; i < i_max - 1; i++) - append_window(win_meta, wins[i]); } + append_win(wmeta, wins[i]); } else { for (i = 1; i < i_max; i++) - append_window(win_meta, wins[i]); - append_window(win_meta, win_shift); } + append_win(wmeta, wins[i]); + append_win(wmeta, w_shift); } else for (i = 0; i < i_max; i++) - if ((dir == 'f' && win_shift == wins[i]) || (dir == 'b' && win_shift == wins[i+1])) { - append_window(win_meta, wins[i+1]); - append_window(win_meta, wins[i]); + if ((dir == 'f' && w_shift == wins[i]) || (dir == 'b' && w_shift == wins[i+1])) { + append_win(wmeta, wins[i+1]); + append_win(wmeta, wins[i]); i++; } else - append_window(win_meta, wins[i]); + append_win(wmeta, wins[i]); free(wins); - win_meta->active = win_shift; } } + wmeta->active = w_shift; } } -extern void reset_pad_offset(struct WinMeta * win_meta, uint16_t new_offset) { +extern void reset_pad_offset(struct WinMeta * wmeta, uint16_t new_offset) { // Apply new_offset to windows pad, if it proves to be sane. - if (new_offset >= 0 && new_offset + win_meta->pad.size.x < getmaxx(win_meta->pad.curses_win)) - win_meta->pad_offset = new_offset; } + if (new_offset >= 0 && new_offset + wmeta->pad.size.x < getmaxx(wmeta->pad.curses_win)) + wmeta->pad_offset = new_offset; } diff --git a/windows.h b/windows.h index 2080ef3..c194907 100644 --- a/windows.h +++ b/windows.h @@ -24,12 +24,12 @@ struct Win { void * data; }; extern struct WinMeta init_win_meta (WINDOW *); -extern struct Win init_window (struct WinMeta *, char *, void *, void *); -extern void append_window (struct WinMeta *, struct Win *); -extern void suspend_window (struct WinMeta *, struct Win *); +extern struct Win init_win (struct WinMeta *, char *, void *, void *); +extern void append_win (struct WinMeta *, struct Win *); +extern void suspend_win (struct WinMeta *, struct Win *); extern void draw_scroll_hint (struct Frame *, uint16_t, uint32_t, char); -extern void draw_all_windows (struct WinMeta *); -extern void resize_active_window (struct WinMeta *, uint16_t, uint16_t); -extern void cycle_active_window (struct WinMeta *, char); -extern void shift_active_window (struct WinMeta *, char); +extern void draw_all_wins (struct WinMeta *); +extern void resize_active_win (struct WinMeta *, uint16_t, uint16_t); +extern void cycle_active_win (struct WinMeta *, char); +extern void shift_active_win (struct WinMeta *, char); extern void reset_pad_offset (struct WinMeta *, uint16_t);