X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=src%2Fwincontrol.c;h=4eca93bc02e1a40777718c4180e8c2e7210ee180;hb=76bcc7383e9b111e02e83c2d822633cf1be88aab;hp=32a3ab195d943cc30f092c62a32a7a4c53d76e9a;hpb=3a4e6fcaf5e774cda536d46e10287fcf8a1dfe85;p=plomrogue
diff --git a/src/wincontrol.c b/src/wincontrol.c
index 32a3ab1..4eca93b 100644
--- a/src/wincontrol.c
+++ b/src/wincontrol.c
@@ -12,7 +12,7 @@
#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 "rexit.h" /* for exit_err(), exit_trouble() */
#include "draw_wins.h" /* for draw_win_map(), draw_win_info(), draw_win_log(),
* draw_win_available_keybindings(),
* draw_win_inventory(), draw_win_keybindings_global(),
@@ -20,7 +20,7 @@
* draw_win_keybindings_winconf_keybindings(),
* draw_winconf_geometry(), draw_winconf_keybindings()
*/
-#include "misc.h" /* for try_malloc(), exit_trouble() */
+#include "misc.h" /* for try_malloc() */
#include "dirent.h" /* for opendir(), closedir(), readdir() */
#include "errno.h" /* for errno */
#include "keybindings.h" /* for KeyBinding struct, free_keybindings() */
@@ -463,7 +463,7 @@ extern void toggle_window(char id)
{
struct Win * win = get_win_by_id(id);
if (0 == win->prev && world.wmeta->chain_start != win) /* Win struct is */
- { /* outside chain. */
+ { /* outside chain? */
append_win(win);
}
else
@@ -480,57 +480,40 @@ extern void toggle_winconfig()
struct WinConf * wcp = get_winconf_by_win(win);
if (0 == wcp->view)
{
- win->draw = draw_winconf_geometry;
- wcp->view = 1;
- wcp->center = win->center;
+ wcp->view = 1;
+ win->draw = draw_winconf_geometry;
+ 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;
+ wcp->view = 2;
+ win->draw = draw_winconf_keybindings;
win->center.x = 0;
}
else
{
- win->draw = get_drawfunc_by_char(wcp->draw);
- win->center = wcp->center;
- wcp->view = 0;
+ wcp->view = 0;
+ win->draw = get_drawfunc_by_char(wcp->draw);
+ win->center = wcp->center;
}
}
-extern void toggle_win_height_type()
+extern void toggle_win_size_type(char axis)
{
struct Win * win = world.wmeta->active;
struct WinConf * wcp = get_winconf_by_win(win);
- if (0 == wcp->height_type)
+ if ('y' == axis)
{
- wcp->height_type = 1;
- }
- else
- {
- wcp->height_type = 0;
- }
- set_winconf_geometry(wcp->id);
-}
-
-
-
-extern void toggle_win_width_type()
-{
- 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;
- }
- else
- {
- wcp->width_type = 0;
+ wcp->height_type = (0 == wcp->height_type);
+ set_winconf_geometry(wcp->id);
+ return;
}
+ wcp->width_type = ( 0 == wcp->width_type
+ && win->framesize.x <= world.wmeta->padsize.x);
set_winconf_geometry(wcp->id);
}