Renamed shift_window() to shift_active_window() for more precise description and...

[plomrogue] / roguelike.c

diff --git a/roguelike.c b/roguelike.c
index 362826c9b863a3c78808a33a0eb2241000b8138e..89b64624036ebd5f16ae0256d46f27a90482e5d0 100644 (file)
--- a/roguelike.c
+++ b/roguelike.c
@@ -44,6 +44,7 @@ void draw_map (struct Win *);
 void draw_info (struct Win *);
 void draw_keys_window (struct Win *);
 void toggle_window (struct WinMeta *, struct Win *);
+void growshrink_active_window (struct WinMeta *, char);
 void init_keybindings(struct World *);
 struct Map init_map ();
 void map_scroll (struct Map *, char);
@@ -192,6 +193,21 @@ void toggle_window (struct WinMeta * win_meta, struct Win * win) {
   else
     append_window(win_meta, win); }
 
+void growshrink_active_window (struct WinMeta * win_meta, char change) {
+// Grow or shrink active window horizontally or vertically by one cell size.
+  if (0 != win_meta->active) {
+    int height = win_meta->active->height;
+    int width = win_meta->active->width;
+    if      (change == '-')
+      height--;
+    else if (change == '+')
+      height++;
+    else if (change == '_')
+      width--;
+    else if (change == '*')
+      width++;
+    resize_active_window (win_meta, height, width); } }
+
 void init_keybindings(struct World * world) {
 // Initialize keybindings from file "keybindings".
   FILE * file = fopen("keybindings", "r");
@@ -475,9 +491,9 @@ int main () {
     if      (key == get_action_key(world.keybindings, "quit"))
       break;
     else if (key == get_action_key(world.keybindings, "scroll pad right"))
-      win_meta.pad_offset++;
-    else if (key == get_action_key(world.keybindings, "scroll pad left") && win_meta.pad_offset > 0)
-      win_meta.pad_offset--;
+      scroll_pad (&win_meta, '+');
+    else if (key == get_action_key(world.keybindings, "scroll pad left"))
+      scroll_pad (&win_meta, '-');
     else if (key == get_action_key(world.keybindings, "toggle keys window"))
       toggle_window(&win_meta, &win_keys);
     else if (key == get_action_key(world.keybindings, "toggle map window"))
@@ -491,17 +507,17 @@ int main () {
     else if (key == get_action_key(world.keybindings, "cycle backwards"))
       cycle_active_window(&win_meta, 'p');
     else if (key == get_action_key(world.keybindings, "shift forwards"))
-      shift_window(&win_meta, 'f');
+      shift_active_window(&win_meta, 'f');
     else if (key == get_action_key(world.keybindings, "shift backwards"))
-      shift_window(&win_meta, 'b');
-    else if (key == get_action_key(world.keybindings, "grow horizontally") && win_meta.active != 0)
-      resize_window(&win_meta, '*');
-    else if (key == get_action_key(world.keybindings, "shrink horizontally") && win_meta.active != 0)
-      resize_window(&win_meta, '_');
-    else if (key == get_action_key(world.keybindings, "grow vertically") && win_meta.active != 0)
-      resize_window(&win_meta, '+');
-    else if (key == get_action_key(world.keybindings, "shrink vertically") && win_meta.active != 0)
-      resize_window(&win_meta, '-');
+      shift_active_window(&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"))
+      growshrink_active_window(&win_meta, '_');
+    else if (key == get_action_key(world.keybindings, "grow vertically"))
+      growshrink_active_window(&win_meta, '+');
+    else if (key == get_action_key(world.keybindings, "shrink vertically"))
+      growshrink_active_window(&win_meta, '-');
     else if (key == get_action_key(world.keybindings, "save keys"))
       save_keybindings(&world);
     else if (key == get_action_key(world.keybindings, "keys nav up"))