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

diff --git a/roguelike.c b/roguelike.c
index bc971d4fba4fc4c6739f93b3257ec6b2dbb5e74d..89b64624036ebd5f16ae0256d46f27a90482e5d0 100644 (file)
--- a/roguelike.c
+++ b/roguelike.c
@@ -507,9 +507,9 @@ 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');
+      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"))

diff --git a/windows.c b/windows.c
index ff0adb2bf370bb4f5b3b32bdbe2de84c98260a29..ba6401b2191a28f6a64938d3b955905a9ff1e206 100644 (file)
--- a/windows.c
+++ b/windows.c
@@ -213,7 +213,7 @@ void cycle_active_window (struct WinMeta * win_meta, char dir) {
       else
         win_meta->active = win_meta->chain_end; } } }
 
-void shift_window (struct WinMeta * win_meta, char dir) {
+void shift_active_window (struct WinMeta * win_meta, char dir) {
 // Move active window forward/backward in window chain. If jumping beyond start/end, move to other chain end.
   if (0 != win_meta->active && win_meta->chain_start != win_meta->chain_end && (dir == 'f' || dir == 'b')) {
     int i, i_max;

diff --git a/windows.h b/windows.h
index c802e055c056f61b51f40354f6e82b30e36f534e..8f06ffc38c85be20bf6681bb181ce2c72ee9291f 100644 (file)
--- a/windows.h
+++ b/windows.h
@@ -42,4 +42,4 @@ void draw_window_borders (struct Win *, char);
 void draw_all_windows (struct WinMeta *);
 void resize_active_window (struct WinMeta *, int, int);
 void cycle_active_window (struct WinMeta *, char);
-void shift_window (struct WinMeta *, char);
+void shift_active_window (struct WinMeta *, char);