}
linemax = linemax + 6; /* + 6 = + 3 digits + whitespace + \n + \0 */
- char keyb_line[linemax];
+ char kb_line[linemax];
kb_p = wc->kb.kbs;
while (0 != kb_p)
{
- snprintf(keyb_line, linemax, "%d %s\n", kb_p->key, kb_p->name);
- try_fwrite(keyb_line, sizeof(char), strlen(keyb_line), file, world, f_name);
+ snprintf(kb_line, linemax, "%d %s\n", kb_p->key, kb_p->name);
+ try_fwrite(kb_line, sizeof(char), strlen(kb_line), file, world, f_name);
kb_p = kb_p->next;
}
struct WinConf * wcp = get_winconf_by_id(world, 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;
}
}
extern uint8_t toggle_window(struct WinMeta * win_meta, struct Win * win)
{
- if (0 != win->frame.curses_win)
+ if (0 == win->prev && win_meta->chain_start != win) /* Win outside chain. */
{
- return suspend_win(win_meta, win);
+ return append_win(win_meta, win);
}
else
{
- return append_win(win_meta, win);
+ return suspend_win(win_meta, win);
}
}
{
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 = get_drawfunc_by_char(wcp->draw);
+ win->center = wcp->center;
wcp->view = 0;
}
}
extern void toggle_win_width_type(struct World * world, struct Win * win)
{
struct WinConf * wcp = get_winconf_by_win(world, win);
- if ( 0 == wcp->width_type
- && win->frame.size.x <= world->wmeta->padframe.size.x)
+ if (0 == wcp->width_type && win->framesize.x <= world->wmeta->padsize.x)
{
wcp->width_type = 1;
}
{
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--;
uint8_t x = resize_active_win(world->wmeta, size);
struct WinConf * wcp = get_winconf_by_win(world, 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;
}