/* wincontrol.c */
#include "wincontrol.h"
-#include <stdlib.h> /* for malloc(), free() */
-#include <string.h> /* for strlen() */
+#include <stdlib.h> /* for free() */
+#include <string.h> /* for strlen(), strchr(), strstr() */
#include <stdint.h> /* for uint8_t, uint16_t */
-#include <stdio.h> /* for fopen(), fclose(), fwrite() */
#include <unistd.h> /* for access(), unlink() */
#include "windows.h" /* for suspend_win(), append_win(), reset_pad_offset(),
* resize_active_win(), init_win(), free_win(),
* structs Win, WinMeta
*/
#include "yx_uint16.h" /* for yx_uint16 struct */
-#include "main.h" /* for Wins struct */
-#include "misc.h" /* for textfile_sizes() */
+#include "main.h" /* for world global */
+#include "readwrite.h" /* for get_linemax(), try_fopen(), try_fclose(),
+ * try_fgets(), try_fclose_unlink_rename(), try_fwrite()
+ */
#include "rexit.h" /* for exit_err() */
-#include "main.h" /* for World, Wins structs */
-#include "draw_wins.h" /* for draw_keys_win(), draw_info_win(), draw_log_win(),
- * draw_map_win
+#include "main.h" /* for world global */
+#include "draw_wins.h" /* for draw_win_map(), draw_win_info(), draw_win_og(),
+ * draw_win_available_keybindings(),
+ * draw_win_keybindings_global(), draw_win_inventory(),
+ * draw_win_keybindings_winconf_geometry(),
+ * draw_win_keybindings_winconf_keybindings(),
+ * draw_winconf_geometry(), draw_winconf_keybindings()
*/
+#include "misc.h" /* for try_malloc(), trouble_msg() */
+#include "dirent.h" /* for opendir(), closedir(), readdir() */
+#include "errno.h" /* for errno */
+#include "keybindings.h" /* for KeyBinding struct, free_keybindings() */
/* Return string "prefix" + "id"; malloc()'s string, remember to call free()! */
-static char * string_prefixed_id(struct World * world, char * prefix, char id);
+static char * string_prefixed_id(char * prefix, char id);
-/* Create Winconf, initialize ->iew/height_type/width_type to 0, ->id to "id"
- * and ->draw to f.
- */
-static void create_winconf(char id, struct WinConf * wcp,
- void (* f) (struct Win *));
+/* Create Winconf, init ->view/height_type/width_type to 0, ->id to "id". */
+static void create_winconf(char id, struct WinConf * wcp);
/* Initialize Winconf of "id" from appropriate config file.*/
-static void init_winconf_from_file(struct World * world, char id);
+static void init_winconf_from_file(char id);
/* Wrapper around init_win() called with values from Winconf of "id". */
-static void init_win_from_winconf(struct World * world, char id);
+static void init_win_from_winconf(char id);
+
+/* Save title, draw function, size of window identified by "id" to conffile. */
+static void save_win_config(char id);
-/* Save title, size of window identified by "id" to its configuration file. */
-static void save_win_config(struct World * world, char id);
+/* Free data pointed to inside WinConf struct. */
+static void free_winconf_data(char id);
-/* Write size of a window to its WinConf, as positive or negative values
+/* Write geometry of a window to its WinConf, as positive or negative values
* (dependent on state ofWinConf->height_type / WinConf->width_type).
*/
-static void set_winconf(struct World * world, char id);
+static void set_winconf_geometry(char id);
/* Get WinConf by "id"; get id of WinConf mothering "win". */
-static struct WinConf * get_winconf_by_id(struct World * world, char id);
-static char get_id_by_win(struct World * world, struct Win * win);
+static struct WinConf * get_winconf_by_id(char id);
+/* Get (Win->draw) function identified by "c"; NULL if c not mapped to one. */
+static void * get_drawfunc_by_char(char c);
+/* Iterate over bytes of world.winconf_ids array. Re-start after null byte. */
+static char get_next_winconf_id();
-static char * string_prefixed_id(struct World * world, char * prefix, char id)
+
+
+static char * string_prefixed_id(char * prefix, char id)
{
- char * err = "Trouble in string_prefixed_id() with malloc().";
uint8_t size = strlen(prefix) + 2;
- char * path = malloc(size);
- exit_err(NULL == path, world, err);
+ char * path = try_malloc(size, "string_prefixed_id()");
sprintf(path, "%s_", prefix);
path[size - 2] = id;
return path;
-static void create_winconf(char id, struct WinConf * wcp,
- void (* f) (struct Win *))
+static void create_winconf(char id, struct WinConf * wcp)
{
wcp->id = id;
- wcp->draw = f;
wcp->view = 0;
wcp->height_type = 0;
wcp->width_type = 0;
+ wcp->kb.edit = 0;
+ wcp->kb.select = 0;
}
-static void init_winconf_from_file(struct World * world, char id)
+static void init_winconf_from_file(char id)
{
- char * err_m = "Trouble in init_win_from_file() with malloc().";
- char * path = string_prefixed_id(world, "config/windows/Win_", id);
- char * err = "Trouble in init_win_from_file() with fopen().";
- FILE * file = fopen(path, "r");
- exit_err(NULL == file, world, err);
+ char * tmp = "init_winconf_from_file() on window id '_'";
+ char * context = try_malloc(strlen(tmp) + 1, "init_winconf_from_file()");
+ memcpy(context, tmp, strlen(tmp) + 1);
+ context[strlen(tmp) - 2] = id;
+
+ char * path = string_prefixed_id("config/windows/Win_", id);
+ FILE * file = try_fopen(path, "r", context);
free(path);
+ uint16_t linemax = get_linemax(file, context);
+ char line[linemax + 1];
- err = "Trouble in init_win_from_file() with textfile_sizes().";
- struct WinConf * winconf = get_winconf_by_id(world, id);
- uint16_t linemax;
- exit_err(textfile_sizes(file, &linemax, NULL), world, err);
- char * line = malloc(linemax);
- exit_err(NULL == line, world, err_m);
-
- err = "Trouble in init_win_from_file() with fgets().";
- exit_err(NULL == fgets(line, linemax, file), world, err);
- winconf->title = malloc(strlen(line));
- exit_err(NULL == winconf->title, world, err_m);
+ struct WinConf * winconf = get_winconf_by_id(id);
+ try_fgets(line, linemax + 1, file, context);
+ winconf->title = try_malloc(strlen(line), context);
memcpy(winconf->title, line, strlen(line) - 1); /* Eliminate newline char */
winconf->title[strlen(line) - 1] = '\0'; /* char at end of string. */
- exit_err(NULL == fgets(line, linemax, file), world, err);
+
+ try_fgets(line, linemax + 1, file, context);
+ winconf->draw = line[0];
+
+ try_fgets(line, linemax + 1, file, context);
winconf->height = atoi(line);
if (0 >= winconf->height)
{
winconf->height_type = 1;
}
- exit_err(NULL == fgets(line, linemax, file), world, err);
+ try_fgets(line, linemax + 1, file, context);
winconf->width = atoi(line);
if (0 >= winconf->width)
{
winconf->width_type = 1;
}
- free(line);
- err = "Trouble in init_win_from_file() with fclose().";
- exit_err(fclose(file), world, err);
+
+ char command[linemax + 1];
+ char * cmdptr;
+ struct KeyBinding ** loc_last_ptr = &winconf->kb.kbs;
+ * loc_last_ptr = 0;
+ while (fgets(command, linemax + 1, file))
+ {
+ if ('\n' == command[0] || 0 == command[0])
+ {
+ break;
+ }
+ * loc_last_ptr = try_malloc(sizeof(struct KeyBinding), context);
+ struct KeyBinding * kb_p = * loc_last_ptr;
+ kb_p->next = 0;
+ kb_p->key = atoi(command);
+ cmdptr = strchr(command, ' ') + 1;
+ kb_p->name = try_malloc(strlen(cmdptr), context);
+ memcpy(kb_p->name, cmdptr, strlen(cmdptr) - 1);
+ kb_p->name[strlen(cmdptr) - 1] = '\0';
+ loc_last_ptr = & kb_p->next;
+ }
+
+ try_fclose(file, context);
+ free(context);
}
-static void init_win_from_winconf(struct World * world, char id)
+static void init_win_from_winconf(char id)
{
- struct WinConf * winconf = get_winconf_by_id(world, id);
- char * err = "Trouble in init_win_from_file() with init_win().";
- exit_err(init_win(world->wmeta, &winconf->win, winconf->title,
- winconf->height, winconf->width, world, winconf->draw),
- world, err);
+ char * err = "get_drawfunc_by_char() returns NULL to init_win_from_file().";
+ struct WinConf * winconf = get_winconf_by_id(id);
+ void * f = get_drawfunc_by_char(winconf->draw);
+ exit_err(NULL == f, err);
+ init_win(&winconf->win, winconf->title, winconf->height, winconf->width, f);
}
-extern void save_win_config(struct World * world, char id)
+static void save_win_config(char id)
{
- char * err_o = "Trouble in save_win_config() with fopen().";
- char * err_m = "Trouble in save_win_config() with malloc().";
- char * err_c = "Trouble in save_win_config() with fclose().";
- char * err_u = "Trouble in save_win_config() with unlink().";
- char * err_r = "Trouble in save_win_config() with rename().";
+ char * f_name = "save_win_config()";
- char * path_tmp = string_prefixed_id(world, "config/windows/Win_tmp_", id);
- FILE * file = fopen(path_tmp, "w");
- exit_err(NULL == file, world, err_o);
+ char * path_tmp = string_prefixed_id("config/windows/Win_tmp_", id);
+ FILE * file = try_fopen(path_tmp, "w", f_name);
- struct WinConf * wc = get_winconf_by_id(world, id);
+ struct WinConf * wc = get_winconf_by_id(id);
uint8_t size = strlen(wc->title) + 2;
if (size < 7)
{
size = 7;
}
- char * line = malloc(size);
- exit_err(NULL == line, world, err_m);
+ char line[size];
sprintf(line, "%s\n", wc->title);
- fwrite(line, sizeof(char), strlen(line), file);
+ try_fwrite(line, sizeof(char), strlen(line), file, f_name);
+ sprintf(line, "%c\n", wc->draw);
+ try_fwrite(line, sizeof(char), strlen(line), file, f_name);
sprintf(line, "%d\n", wc->height);
- fwrite(line, sizeof(char), strlen(line), file);
+ try_fwrite(line, sizeof(char), strlen(line), file, f_name);
sprintf(line, "%d\n", wc->width);
- fwrite(line, sizeof(char), strlen(line), file);
+ try_fwrite(line, sizeof(char), strlen(line), file, f_name);
+
+ uint16_t linemax = 0;
+ struct KeyBinding * kb_p = wc->kb.kbs;
+ while (0 != kb_p)
+ {
+ if (strlen(kb_p->name) > linemax)
+ {
+ linemax = strlen(kb_p->name);
+ }
+ kb_p = kb_p->next;
+ }
+ linemax = linemax + 6; /* + 6 = + 3 digits + whitespace + \n + \0 */
- exit_err(fclose(file), world, err_c);
- char * path = string_prefixed_id(world, "config/windows/Win_", id);
- if (!access(path, F_OK))
+ char kb_line[linemax];
+ kb_p = wc->kb.kbs;
+ while (0 != kb_p)
{
- exit_err(unlink(path), world, err_u);
+ snprintf(kb_line, linemax, "%d %s\n", kb_p->key, kb_p->name);
+ try_fwrite(kb_line, sizeof(char), strlen(kb_line), file, f_name);
+ kb_p = kb_p->next;
}
- exit_err(rename(path_tmp, path), world, err_r);
+
+ char * path = string_prefixed_id("config/windows/Win_", id);
+ try_fclose_unlink_rename(file, path_tmp, path, f_name);
free(path);
free(path_tmp);
}
-static void set_winconf(struct World * world, char id)
+static void free_winconf_data(char id)
{
- struct WinConf * wcp = get_winconf_by_id(world, id);
+ struct WinConf * wc = get_winconf_by_id(id);
+ free(wc->title);
+ free_keybindings(wc->kb.kbs);
+ free_win(wc->win);
+}
+
+
+
+static void set_winconf_geometry(char id)
+{
+ struct WinConf * wcp = get_winconf_by_id(id);
if (0 == wcp->height_type)
{
- wcp->height = wcp->win->frame.size.y;
+ wcp->height = wcp->win->framesize.y;
}
else if (1 == wcp->height_type)
{
- wcp->height = wcp->win->frame.size.y - world->wmeta->padframe.size.y
- + 1;
+ wcp->height = wcp->win->framesize.y - world.wmeta->padsize.y + 1;
}
if (0 == wcp->width_type)
{
- wcp->width = wcp->win->frame.size.x;
+ wcp->width = wcp->win->framesize.x;
}
else if (1 == wcp->width_type)
{
- wcp->width = wcp->win->frame.size.x - world->wmeta->padframe.size.x;
+ wcp->width = wcp->win->framesize.x - world.wmeta->padsize.x;
}
}
-static struct WinConf * get_winconf_by_id(struct World * world, char id)
+static struct WinConf * get_winconf_by_id(char id)
{
uint8_t i = 0;
while (1)
{
- if (id == world->winconfs[i].id)
+ if (id == world.winconfs[i].id)
{
- return &world->winconfs[i];
+ return &world.winconfs[i];
}
i++;
}
-static char get_id_by_win(struct World * world, struct Win * win)
+static void * get_drawfunc_by_char(char c)
{
- struct WinConf * wc = get_winconf_by_win(world, win);
- return wc->id;
+ if ('c' == c)
+ {
+ return draw_win_inventory;
+ }
+ if ('i' == c)
+ {
+ return draw_win_info;
+ }
+ else if ('l' == c)
+ {
+ return draw_win_log;
+ }
+ else if ('k' == c)
+ {
+ return draw_win_available_keybindings;
+ }
+ else if ('m' == c)
+ {
+ return draw_win_map;
+ }
+ else if ('0' == c)
+ {
+ return draw_win_keybindings_global;
+ }
+ else if ('1' == c)
+ {
+ return draw_win_keybindings_winconf_geometry;
+ }
+ else if ('2' == c)
+ {
+ return draw_win_keybindings_winconf_keybindings;
+ }
+ return NULL;
}
-extern struct WinConf * get_winconf_by_win(struct World * world,
- struct Win * win)
+static char get_next_winconf_id()
{
- uint8_t i = 0;
- while (1)
+ static uint8_t i = 0;
+ char c = world.winconf_ids[i];
+ if (0 == c)
+ {
+ i = 0;
+ }
+ else
{
- if (win == world->winconfs[i].win)
- {
- return &world->winconfs[i];
- }
i++;
}
+ return c;
}
-extern struct Win * get_win_by_id(struct World * world, char id)
+extern struct WinConf * get_winconf_by_win(struct Win * win)
{
- struct WinConf * wc = get_winconf_by_id(world, id);
- return wc->win;
+ uint8_t i = 0;
+ while (1)
+ {
+ if (win == world.winconfs[i].win)
+ {
+ return &world.winconfs[i];
+ }
+ i++;
+ }
}
-extern void create_winconfs(struct World * world)
+extern struct Win * get_win_by_id(char id)
{
- char * err = "Trouble with malloc() in init_winconfs().";
- struct WinConf * winconfs = malloc(4 * sizeof(struct WinConf));
- exit_err(NULL == winconfs, world, err);
- create_winconf('i', &winconfs[0], draw_info_win);
- create_winconf('k', &winconfs[1], draw_keys_win);
- create_winconf('l', &winconfs[2], draw_log_win);
- create_winconf('m', &winconfs[3], draw_map_win);
- world->winconfs = winconfs;
+ struct WinConf * wc = get_winconf_by_id(id);
+ return wc->win;
}
-extern void init_winconfs(struct World * world)
+extern void init_winconfs()
{
- init_winconf_from_file(world, 'i');
- init_winconf_from_file(world, 'k');
- init_winconf_from_file(world, 'l');
- init_winconf_from_file(world, 'm');
+ char * f_name = "init_winconfs()";
+ char * err_o = "Trouble in init_winconfs() with opendir().";
+ char * err_r = "Trouble in init_winconfs() with readdir().";
+ char * err_c = "Trouble in init_winconfs() with closedir().";
+
+ DIR * dp = opendir("config/windows");
+ exit_err(NULL == dp, err_o);
+ struct dirent * fn;
+ errno = 0;
+ char * winconf_ids = try_malloc(256, f_name);
+ uint8_t i = 0;
+ char id;
+ while (NULL != (fn = readdir(dp)))
+ {
+ if (5 == strlen(fn->d_name) && fn->d_name == strstr(fn->d_name, "Win_"))
+ {
+ id = fn->d_name[4];
+ winconf_ids[i] = id;
+ i++;
+ }
+ }
+ winconf_ids[i] = '\0';
+ exit_err(errno, err_r);
+ exit_err(closedir(dp), err_c);
+ world.winconf_ids = try_malloc(strlen(winconf_ids) + 1, f_name);
+ memcpy(world.winconf_ids, winconf_ids, strlen(winconf_ids) + 1);
+ free(winconf_ids);
+
+ struct WinConf * winconfs;
+ winconfs = try_malloc(strlen(world.winconf_ids) * sizeof(struct WinConf),
+ f_name);
+ i = 0;
+ while (0 != (id = get_next_winconf_id()))
+ {
+ create_winconf(id, &winconfs[i]);
+ i++;
+ }
+ world.winconfs = winconfs;
+ while (0 != (id = get_next_winconf_id()))
+ {
+ init_winconf_from_file(id);
+ i++;
+ }
}
-extern void free_winconf(struct World * world, char id)
+extern void free_winconfs()
{
- struct WinConf * wc = get_winconf_by_id(world, id);
- free(wc->title);
+ char id;
+ while (0 != (id = get_next_winconf_id()))
+ {
+ free_winconf_data(id);
+ }
+ free(world.winconf_ids);
+ free(world.winconfs);
}
-extern void free_winconfs(struct World * world)
+extern void init_wins()
{
- free_winconf(world, 'i');
- free_winconf(world, 'k');
- free_winconf(world, 'l');
- free_winconf(world, 'm');
- free(world->winconfs);
+ char id;
+ while (0 != (id = get_next_winconf_id()))
+ {
+ init_win_from_winconf(id);
+ }
}
-extern void init_wins(struct World * world)
+extern void sorted_wintoggle_and_activate()
{
- init_win_from_winconf(world, 'i');
- init_win_from_winconf(world, 'k');
- init_win_from_winconf(world, 'l');
- init_win_from_winconf(world, 'm');
-}
-
+ char * f_name = "sorted_wintoggle_and_activate()";
+ char * path = "config/windows/toggle_order_and_active";
+ FILE * file = try_fopen(path, "r", f_name);
+ uint16_t linemax = get_linemax(file, f_name);
-extern void free_wins(struct World * world)
-{
- free_win(get_win_by_id(world, 'i'));
- free_win(get_win_by_id(world, 'k'));
- free_win(get_win_by_id(world, 'l'));
- free_win(get_win_by_id(world, 'm'));
-}
+ char win_order[linemax + 1];
+ try_fgets(win_order, linemax + 1, file, f_name);
+ uint8_t a = 0;
+ char * err = trouble_msg(f_name, "read_uint8()");
+ exit_err(read_uint8(file, &a), err);
+ free(err);
+ try_fclose(file, f_name);
-extern void sorted_wintoggle(struct World * world)
-{
- char * err = "Trouble in sorted_wintoggle() with fopen().";
- FILE * file = fopen("config/windows/toggle_order", "r");
- exit_err(NULL == file, world, err);
- uint16_t linemax;
- err = "Trouble in sorted_wintoggle() with textfile_sizes().";
- exit_err(textfile_sizes(file, &linemax, NULL), world, err);
- char win_order[linemax];
- err = "Trouble in sorted_wintoggle() with fgets().";
- exit_err(NULL == fgets(win_order, linemax, file), world, err);
- err = "Trouble in sorted_wintoggle() with fclose().";
- exit_err(fclose(file), world, err);
uint8_t i = 0;
- for (; i < linemax - 2; i++)
+ for (; i < linemax - 1; i++)
{
- toggle_window(world->wmeta, get_win_by_id(world, win_order[i]));
+ if (NULL == strchr(world.winconf_ids, win_order[i]))
+ {
+ continue;
+ }
+ toggle_window(win_order[i]);
+
+ if (a == (uint8_t) win_order[i])
+ {
+ world.wmeta->active = get_win_by_id(win_order[i]);
+ }
}
}
-extern void reload_win_config(struct World * world)
+extern void save_win_configs()
{
- while (0 != world->wmeta->active)
+ char * f_name = "save_win_configs()";
+
+ char id;
+ while (0 != (id = get_next_winconf_id()))
{
- suspend_win(world->wmeta, world->wmeta->active);
+ save_win_config(id);
}
- free_wins(world);
- free_winconfs(world);
- create_winconfs(world);
- init_winconfs(world);
- init_wins(world);
- sorted_wintoggle(world);
-}
-
+ char * path = "config/windows/toggle_order_and_active";
+ char * path_tmp = "config/windows/toggle_order_and_active_tmp";
+ FILE * file = try_fopen(path_tmp, "w", f_name);
-extern void save_win_configs(struct World * world)
-{
- save_win_config(world, 'i');
- save_win_config(world, 'k');
- save_win_config(world, 'l');
- save_win_config(world, 'm');
-
- char * err_o = "Trouble in save_win_configs() with fopen().";
- char * err_m = "Trouble in save_win_configs() with calloc().";
- char * err_c = "Trouble in save_win_configs() with fclose().";
- char * err_u = "Trouble in save_win_configs() with unlink().";
- char * err_r = "Trouble in save_win_configs() with rename().";
-
- char * path = "config/windows/toggle_order";
- char * path_tmp = "config/windows/toggle_order_tmp";
- FILE * file = fopen(path_tmp, "w");
- exit_err(NULL == file, world, err_o);
-
- char * line = calloc(6, sizeof(char));
- exit_err(NULL == line, world, err_m);
- struct Win * w_p = world->wmeta->_chain_start;
+ char line[6];
+ struct Win * w_p = world.wmeta->chain_start;
uint8_t i = 0;
while (0 != w_p)
{
- line[i] = get_id_by_win(world, w_p);
- w_p = w_p->_next;
+ struct WinConf * wc = get_winconf_by_win(w_p);
+ line[i] = wc->id;
+ w_p = w_p->next;
i++;
}
line[i] = '\n';
- fwrite(line, sizeof(char), strlen(line), file);
-
- exit_err(fclose(file), world, err_c);
- if (!access(path, F_OK))
+ try_fwrite(line, sizeof(char), strlen(line), file, f_name);
+ if (0 != world.wmeta->active)
{
- exit_err(unlink(path), world, err_u);
+ struct WinConf * wc = get_winconf_by_win(world.wmeta->active);
+ write_uint8(wc->id, file);
}
- exit_err(rename(path_tmp, path), world, err_r);
+
+ try_fclose_unlink_rename(file, path_tmp, path, f_name);
}
-extern uint8_t toggle_window(struct WinMeta * win_meta, struct Win * win)
+extern void toggle_window(char id)
{
- if (0 != win->frame.curses_win)
- {
- return suspend_win(win_meta, win);
+ struct Win * win = get_win_by_id(id);
+ if (0 == win->prev && world.wmeta->chain_start != win) /* Win struct is */
+ { /* outside chain. */
+ append_win(win);
}
else
{
- return append_win(win_meta, win);
+ suspend_win(win);
}
}
-extern void toggle_winconfig(struct World * world, struct Win * win)
+extern void toggle_winconfig()
{
- struct WinConf * wcp = get_winconf_by_win(world, win);
- if (0 == wcp->view)
+ struct Win * win = world.wmeta->active;
+ struct WinConf * wcp = get_winconf_by_win(win);
+ if (0 == wcp->view)
{
- win->_draw = draw_winconf;
+ win->draw = draw_winconf_geometry;
wcp->view = 1;
+ wcp->center = win->center;
+ win->center.y = 0;
+ win->center.x = 0;
+ }
+ else if (1 == wcp->view)
+ {
+ win->draw = draw_winconf_keybindings;
+ wcp->view = 2;
+ win->center.x = 0;
}
else
{
- win->_draw = wcp->draw;
+ win->draw = get_drawfunc_by_char(wcp->draw);
+ win->center = wcp->center;
wcp->view = 0;
}
}
-extern void toggle_win_height_type(struct World * world, struct Win * win)
+extern void toggle_win_height_type()
{
- struct WinConf * wcp = get_winconf_by_win(world, win);
+ struct Win * win = world.wmeta->active;
+ struct WinConf * wcp = get_winconf_by_win(win);
if (0 == wcp->height_type)
{
wcp->height_type = 1;
{
wcp->height_type = 0;
}
- set_winconf(world, wcp->id);
+ set_winconf_geometry(wcp->id);
}
-extern void toggle_win_width_type(struct World * world, struct Win * win)
+extern void toggle_win_width_type()
{
- struct WinConf * wcp = get_winconf_by_win(world, win);
- if ( 0 == wcp->width_type
- && win->frame.size.x <= world->wmeta->padframe.size.x)
+ struct Win * win = world.wmeta->active;
+ struct WinConf * wcp = get_winconf_by_win(win);
+ if (0 == wcp->width_type && win->framesize.x <= world.wmeta->padsize.x)
{
wcp->width_type = 1;
}
{
wcp->width_type = 0;
}
- set_winconf(world, wcp->id);
+ set_winconf_geometry(wcp->id);
}
-extern void scroll_pad(struct WinMeta * win_meta, char dir)
+extern void scroll_pad(char dir)
{
if ('+' == dir)
{
- reset_pad_offset(win_meta, win_meta->pad_offset + 1);
+ reset_pad_offset(world.wmeta->pad_offset + 1);
}
else if ('-' == dir)
{
- reset_pad_offset(win_meta, win_meta->pad_offset - 1);
+ reset_pad_offset(world.wmeta->pad_offset - 1);
}
}
-extern uint8_t growshrink_active_window(struct World * world, char change)
+extern void growshrink_active_window(char change)
{
- if (0 != world->wmeta->active)
+ if (0 != world.wmeta->active)
{
- struct yx_uint16 size = world->wmeta->active->frame.size;
+ struct yx_uint16 size = world.wmeta->active->framesize;
if (change == '-')
{
size.y--;
{
size.x++;
}
- uint8_t x = resize_active_win(world->wmeta, size);
- struct WinConf * wcp = get_winconf_by_win(world, world->wmeta->active);
+ resize_active_win(size);
+ struct WinConf * wcp = get_winconf_by_win(world.wmeta->active);
if ( 1 == wcp->width_type
- && world->wmeta->active->frame.size.x
- > world->wmeta->padframe.size.x)
+ && world.wmeta->active->framesize.x > world.wmeta->padsize.x)
{
wcp->width_type = 0;
}
- set_winconf(world, wcp->id);
- return x;
+ set_winconf_geometry(wcp->id);
}
- return 0;
}
projects / plomrogue / blobdiff