-extern void toggle_window(struct WinMeta * win_meta, struct Win * win)
+extern uint8_t toggle_window(struct WinMeta * win_meta, struct Win * win)
{
if (0 != win->frame.curses_win)
{
- suspend_win(win_meta, win);
+ return suspend_win(win_meta, win);
}
else
{
- append_win(win_meta, win);
+ return append_win(win_meta, win);
}
}
-extern void growshrink_active_window(struct WinMeta * win_meta, char change)
+extern uint8_t growshrink_active_window(struct WinMeta * win_meta, char change)
{
if (0 != win_meta->active)
{
{
size.x++;
}
- resize_active_win (win_meta, size);
+ return resize_active_win (win_meta, size);
}
+ return 0;
}
struct Win * win_map, struct Win * win_info,
struct Win * win_log)
{
+ char * err_toggle = "Trouble toggling window.";
+ char * err_shift = "Trouble shifting window.";
+ char * err_resize = "Trouble resizing window.";
if (key == get_action_key(world->keybindings, "quit"))
{
return 1;
}
else if (key == get_action_key(world->keybindings, "toggle keys window"))
{
- toggle_window(win_meta, win_keys);
+ exit_err(toggle_window(win_meta, win_keys), world, err_toggle);
}
else if (key == get_action_key(world->keybindings, "toggle map window"))
{
- toggle_window(win_meta, win_map);
+ exit_err(toggle_window(win_meta, win_map), world, err_toggle);
}
else if (key == get_action_key(world->keybindings, "toggle info window"))
{
- toggle_window(win_meta, win_info);
+ exit_err(toggle_window(win_meta, win_info), world, err_toggle);
}
else if (key == get_action_key(world->keybindings, "toggle log window"))
{
- toggle_window(win_meta, win_log);
+ exit_err(toggle_window(win_meta, win_log), world, err_toggle);
}
else if (key == get_action_key(world->keybindings, "cycle forwards"))
{
}
else if (key == get_action_key(world->keybindings, "shift forwards"))
{
- shift_active_win(win_meta, 'f');
+ exit_err(shift_active_win(win_meta, 'f'), world, err_shift);
}
else if (key == get_action_key(world->keybindings, "shift backwards"))
{
- shift_active_win(win_meta, 'b');
+ exit_err(shift_active_win(win_meta, 'b'), world, err_shift);
}
else if (key == get_action_key(world->keybindings, "grow horizontally"))
{
- growshrink_active_window(win_meta, '*');
+ exit_err(growshrink_active_window(win_meta, '*'), world, err_resize);
}
else if (key == get_action_key(world->keybindings, "shrink horizontally"))
{
- growshrink_active_window(win_meta, '_');
+ exit_err(growshrink_active_window(win_meta, '_'), world, err_resize);
}
else if (key == get_action_key(world->keybindings, "grow vertically"))
{
- growshrink_active_window(win_meta, '+');
+ exit_err(growshrink_active_window(win_meta, '+'), world, err_resize);
}
else if (key == get_action_key(world->keybindings, "shrink vertically"))
{
- growshrink_active_window(win_meta, '-');
+ exit_err(growshrink_active_window(win_meta, '-'), world, err_resize);
}
else if (key == get_action_key(world->keybindings, "save keys"))
{