[Refactor] #40457 Moved window-related files from view/ to window/

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index e00b003..dac6c8e 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -300,12 +300,12 @@
     <ClCompile Include="..\..\src\status\temporary-resistance.c" />\r
     <ClCompile Include="..\..\src\view\display-inventory.c" />\r
     <ClCompile Include="..\..\src\view\display-map.c" />\r
-    <ClCompile Include="..\..\src\view\display-sub-window-items.c" />\r
-    <ClCompile Include="..\..\src\view\display-sub-window-spells.c" />\r
-    <ClCompile Include="..\..\src\view\display-sub-windows.c" />\r
-    <ClCompile Include="..\..\src\view\main-window-left-frame.c" />\r
-    <ClCompile Include="..\..\src\view\main-window-stat-poster.c" />\r
-    <ClCompile Include="..\..\src\view\main-window-util.c" />\r
+    <ClCompile Include="..\..\src\window\display-sub-window-items.c" />\r
+    <ClCompile Include="..\..\src\window\display-sub-window-spells.c" />\r
+    <ClCompile Include="..\..\src\window\display-sub-windows.c" />\r
+    <ClCompile Include="..\..\src\window\main-window-left-frame.c" />\r
+    <ClCompile Include="..\..\src\window\main-window-stat-poster.c" />\r
+    <ClCompile Include="..\..\src\window\main-window-util.c" />\r
     <ClCompile Include="..\..\src\mspell\monster-power-table.c" />\r
     <ClCompile Include="..\..\src\system\alloc-entries.c" />\r
     <ClCompile Include="..\..\src\term\screen-processor.c" />\r
@@ -1218,13 +1218,13 @@
     <ClInclude Include="..\..\src\view\display-map.h" />\r
     <ClInclude Include="..\..\src\view\display-messages.h" />\r
     <ClInclude Include="..\..\src\view\display-monster-status.h" />\r
-    <ClInclude Include="..\..\src\view\display-sub-window-items.h" />\r
-    <ClInclude Include="..\..\src\view\display-sub-window-spells.h" />\r
-    <ClInclude Include="..\..\src\view\display-sub-windows.h" />\r
-    <ClInclude Include="..\..\src\view\main-window-left-frame.h" />\r
-    <ClInclude Include="..\..\src\view\main-window-row-column.h" />\r
-    <ClInclude Include="..\..\src\view\main-window-stat-poster.h" />\r
-    <ClInclude Include="..\..\src\view\main-window-util.h" />\r
+    <ClInclude Include="..\..\src\window\display-sub-window-items.h" />\r
+    <ClInclude Include="..\..\src\window\display-sub-window-spells.h" />\r
+    <ClInclude Include="..\..\src\window\display-sub-windows.h" />\r
+    <ClInclude Include="..\..\src\window\main-window-left-frame.h" />\r
+    <ClInclude Include="..\..\src\window\main-window-row-column.h" />\r
+    <ClInclude Include="..\..\src\window\main-window-stat-poster.h" />\r
+    <ClInclude Include="..\..\src\window\main-window-util.h" />\r
     <ClInclude Include="..\..\src\view\object-describer.h" />\r
     <ClInclude Include="..\..\src\view\status-bars-table.h" />\r
     <ClInclude Include="..\..\src\window\main-window-equipments.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 30e7f79..029958f 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -1367,18 +1367,6 @@
     <ClCompile Include="..\..\src\view\status-bars-table.c">
       <Filter>view</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\view\main-window-util.c">
-      <Filter>view</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\view\main-window-stat-poster.c">
-      <Filter>view</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\view\main-window-left-frame.c">
-      <Filter>view</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\view\display-sub-windows.c">
-      <Filter>view</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\core\window-redrawer.c">
       <Filter>core</Filter>
     </ClCompile>
@@ -1553,9 +1541,6 @@
     <ClCompile Include="..\..\src\spell-kind\spells-equipment.c">
       <Filter>spell-kind</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\view\display-sub-window-spells.c">
-      <Filter>view</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\spell-kind\spells-polymorph.c">
       <Filter>spell-kind</Filter>
     </ClCompile>
@@ -1664,9 +1649,6 @@
     <ClCompile Include="..\..\src\flavor\named-item-describer.c">
       <Filter>flavor</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\view\display-sub-window-items.c">
-      <Filter>view</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\flavor\object-flavor.c">
       <Filter>flavor</Filter>
     </ClCompile>
@@ -1718,6 +1700,24 @@
     <ClCompile Include="..\..\src\window\main-window-equipments.c">
       <Filter>window</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\window\display-sub-window-items.c">
+      <Filter>window</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\window\display-sub-windows.c">
+      <Filter>window</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\window\display-sub-window-spells.c">
+      <Filter>window</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\window\main-window-left-frame.c">
+      <Filter>window</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\window\main-window-stat-poster.c">
+      <Filter>window</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\window\main-window-util.c">
+      <Filter>window</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\combat\shoot.h">
@@ -3370,21 +3370,6 @@
     <ClInclude Include="..\..\src\view\status-bars-table.h">
       <Filter>view</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\view\main-window-row-column.h">
-      <Filter>view</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\view\main-window-util.h">
-      <Filter>view</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\view\main-window-stat-poster.h">
-      <Filter>view</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\view\main-window-left-frame.h">
-      <Filter>view</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\view\display-sub-windows.h">
-      <Filter>view</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\core\window-redrawer.h">
       <Filter>core</Filter>
     </ClInclude>
@@ -3568,9 +3553,6 @@
     <ClInclude Include="..\..\src\spell-kind\spells-equipment.h">
       <Filter>spell-kind</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\view\display-sub-window-spells.h">
-      <Filter>view</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\spell-kind\spells-polymorph.h">
       <Filter>spell-kind</Filter>
     </ClInclude>
@@ -3697,9 +3679,6 @@
     <ClInclude Include="..\..\src\flavor\named-item-describer.h">
       <Filter>flavor</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\view\display-sub-window-items.h">
-      <Filter>view</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\flavor\object-flavor.h">
       <Filter>flavor</Filter>
     </ClInclude>
@@ -3754,6 +3733,27 @@
     <ClInclude Include="..\..\src\window\main-window-equipments.h">
       <Filter>window</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\window\display-sub-window-items.h">
+      <Filter>window</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\window\display-sub-windows.h">
+      <Filter>window</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\window\display-sub-window-spells.h">
+      <Filter>window</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\window\main-window-left-frame.h">
+      <Filter>window</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\window\main-window-row-column.h">
+      <Filter>window</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\window\main-window-stat-poster.h">
+      <Filter>window</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\window\main-window-util.h">
+      <Filter>window</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index 5b15976..6f80033 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -695,18 +695,18 @@ hengband_SOURCES = \
        view/display-player-misc-info.c view/display-player-misc-info.h \
        view/display-player-middle.c view/display-player-middle.h \
        view/display-player.c view/display-player.h \
-       view/display-sub-items.c view/display-sub-items.h \
-       view/display-sub-window-spells.c view/display-sub-window-spells.h \
-       view/display-sub-windows.c view/display-sub-windows.h \
        view/display-util.c view/display-util.h \
-       view/main-window-left-frame.c view/main-window-left-frame.h \
-       view/main-window-row-column.h \
-       view/main-window-stat-poster.c view/main-window-stat-poster.h \
-       view/main-window-util.c view/main-window-util.h \
        view/object-describer.c view/object-describer.h \
        view/status-first-page.c view/status-first-page.h \
        view/status-bars-table.c view/status-bars-table.h \
        \
+       window/display-sub-window-items.c window/display-sub-window-items.h \
+       window/display-sub-window-spells.c window/display-sub-window-spells.h \
+       window/display-sub-windows.c window/display-sub-windows.h \
+       window/main-window-left-frame.c window/main-window-left-frame.h \
+       window/main-window-row-column.h \
+       window/main-window-stat-poster.c window/main-window-stat-poster.h \
+       window/main-window-util.c window/main-window-util.h \
        window/main-window-equipment.c window/main-window-equipment.h \
        \
        wizard/spoiler-table.c wizard/spoiler-table.h \

diff --git a/src/cmd-item/cmd-item.c b/src/cmd-item/cmd-item.c
index 0201361..5d54bc3 100644 (file)
--- a/src/cmd-item/cmd-item.c
+++ b/src/cmd-item/cmd-item.c
@@ -89,7 +89,7 @@
 #include "util/quarks.h"
 #include "view/display-inventory.h"
 #include "view/display-messages.h"
-#include "view/main-window-util.h"
+#include "window/main-window-util.h"
 
 /*!
  * @brief 持ち物一覧を表示するコマンドのメインルーチン / Display inventory_list

diff --git a/src/cmd-visual/cmd-map.c b/src/cmd-visual/cmd-map.c
index f2fc0ea..7719ea4 100644 (file)
--- a/src/cmd-visual/cmd-map.c
+++ b/src/cmd-visual/cmd-map.c
@@ -4,7 +4,7 @@
 #include "io/input-key-acceptor.h"
 #include "term/screen-processor.h"
 #include "view/display-map.h"
-#include "view/main-window-util.h"
+#include "window/main-window-util.h"
 
 /*
  * Display a "small-scale" map of the dungeon for the player

diff --git a/src/core/game-play.c b/src/core/game-play.c
index 69ecd26..be18fbc 100644 (file)
--- a/src/core/game-play.c
+++ b/src/core/game-play.c
@@ -78,7 +78,7 @@
 #include "util/angband-files.h"
 #include "view/display-messages.h"
 #include "view/display-player.h"
-#include "view/main-window-util.h"
+#include "window/main-window-util.h"
 #include "world/world.h"
 
 /*!

diff --git a/src/core/window-redrawer.c b/src/core/window-redrawer.c
index e2d9739..2bc3707 100644 (file)
--- a/src/core/window-redrawer.c
+++ b/src/core/window-redrawer.c
@@ -14,12 +14,12 @@
 #include "term/term-color-types.h"
 #include "view/display-messages.h"
 #include "view/display-player.h"
-#include "view/display-sub-windows.h"
-#include "view/display-sub-window-spells.h"
-#include "view/main-window-left-frame.h"
-#include "view/main-window-row-column.h"
-#include "view/main-window-stat-poster.h"
-#include "view/main-window-util.h"
+#include "window/display-sub-windows.h"
+#include "window/display-sub-window-spells.h"
+#include "window/main-window-left-frame.h"
+#include "window/main-window-row-column.h"
+#include "window/main-window-stat-poster.h"
+#include "window/main-window-util.h"
 #include "world/world-turn-processor.h"
 #include "world/world.h"
 

diff --git a/src/flavor/flavor-describer.c b/src/flavor/flavor-describer.c
index c113120..1bd82e5 100644 (file)
--- a/src/flavor/flavor-describer.c
+++ b/src/flavor/flavor-describer.c
@@ -28,7 +28,7 @@
 #include "sv-definition/sv-lite-types.h"
 #include "util/bit-flags-calculator.h"
 #include "util/string-processor.h"
-#include "view/display-sub-window-items.h"
+#include "window/display-sub-window-items.h"
 
 static void describe_chest_trap(flavor_type *flavor_ptr)
 {

diff --git a/src/floor/fixed-map-generator.c b/src/floor/fixed-map-generator.c
index 7e26839..e59f54b 100644 (file)
--- a/src/floor/fixed-map-generator.c
+++ b/src/floor/fixed-map-generator.c
@@ -29,7 +29,7 @@
 #include "room/rooms-vault.h"
 #include "sv-definition/sv-scroll-types.h"
 #include "system/system-variables.h"
-#include "view/main-window-util.h"
+#include "window/main-window-util.h"
 #include "world/world-object.h"
 #include "world/world.h"
 

diff --git a/src/floor/floor-generate.c b/src/floor/floor-generate.c
index 0fcd6d8..894bf20 100644 (file)
--- a/src/floor/floor-generate.c
+++ b/src/floor/floor-generate.c
@@ -48,7 +48,7 @@
 #include "system/system-variables.h"
 #include "util/bit-flags-calculator.h"
 #include "view/display-messages.h"
-#include "view/main-window-util.h"
+#include "window/main-window-util.h"
 #include "wizard/wizard-messages.h"
 #include "world/world.h"
 

diff --git a/src/floor/floor-save.c b/src/floor/floor-save.c
index dd15cf3..16728b8 100644 (file)
--- a/src/floor/floor-save.c
+++ b/src/floor/floor-save.c
@@ -62,7 +62,7 @@
 #include "util/angband-files.h"
 #include "util/bit-flags-calculator.h"
 #include "view/display-messages.h"
-#include "view/main-window-util.h"
+#include "window/main-window-util.h"
 #include "world/world.h"
 
 bool repair_monsters;

diff --git a/src/floor/wild.c b/src/floor/wild.c
index bd4358a..a7eea08 100644 (file)
--- a/src/floor/wild.c
+++ b/src/floor/wild.c
@@ -39,7 +39,7 @@
 #include "system/system-variables.h"
 #include "util/bit-flags-calculator.h"
 #include "view/display-messages.h"
-#include "view/main-window-util.h"
+#include "window/main-window-util.h"
 #include "world/world.h"
 
 #define MAX_FEAT_IN_TERRAIN 18

diff --git a/src/grid/grid.c b/src/grid/grid.c
index 7222fcb..f8c51c2 100644 (file)
--- a/src/grid/grid.c
+++ b/src/grid/grid.c
@@ -43,7 +43,7 @@
 #include "util/bit-flags-calculator.h"
 #include "view/display-map.h"
 #include "view/display-messages.h"
-#include "view/main-window-util.h"
+#include "window/main-window-util.h"
 #include "world/world.h"
 
 #define MONSTER_FLOW_DEPTH 32 /*!< 敵のプレイヤーに対する移動道のりの最大値(この値以上は処理を打ち切る) / OPTION: Maximum flow depth when using "MONSTER_FLOW" */

diff --git a/src/inventory/floor-item-getter.c b/src/inventory/floor-item-getter.c
index 97c7a65..3c9fce8 100644 (file)
--- a/src/inventory/floor-item-getter.c
+++ b/src/inventory/floor-item-getter.c
@@ -29,7 +29,7 @@
 #include "util/int-char-converter.h"
 #include "view/display-inventory.h"
 #include "view/display-messages.h"
-#include "view/display-sub-windows.h"
+#include "window/display-sub-windows.h"
 
 /*!
  * todo 適切な関数名をどうしても付けられなかったので暫定でauxとした

diff --git a/src/inventory/item-getter.c b/src/inventory/item-getter.c
index 1bb53cd..22ae183 100644 (file)
--- a/src/inventory/item-getter.c
+++ b/src/inventory/item-getter.c
@@ -23,7 +23,7 @@
 #include "util/int-char-converter.h"
 #include "view/display-inventory.h"
 #include "view/display-messages.h"
-#include "view/display-sub-windows.h"
+#include "window/display-sub-windows.h"
 
 /*!
  * @brief オブジェクト選択のモード設定

diff --git a/src/io/cursor.c b/src/io/cursor.c
index 7de5fe0..b28c44d 100644 (file)
--- a/src/io/cursor.c
+++ b/src/io/cursor.c
@@ -14,7 +14,7 @@
 #include "term/term-color-types.h"
 #include "util/bit-flags-calculator.h"
 #include "view/display-map.h"
-#include "view/main-window-util.h"
+#include "window/main-window-util.h"
 #include "world/world.h"
 
 /*

diff --git a/src/io/input-key-processor.c b/src/io/input-key-processor.c
index 98934a8..ce3e27d 100644 (file)
--- a/src/io/input-key-processor.c
+++ b/src/io/input-key-processor.c
@@ -78,7 +78,7 @@
 #include "term/screen-processor.h"
 #include "util/int-char-converter.h"
 #include "view/display-messages.h"
-#include "view/display-sub-windows.h"
+#include "window/display-sub-windows.h"
 #include "wizard/wizard-special-process.h"
 #include "wizard/wizard-spoiler.h"
 #include "world/world.h"

diff --git a/src/io/input-key-requester.c b/src/io/input-key-requester.c
index 1580ae3..1dc95d5 100644 (file)
--- a/src/io/input-key-requester.c
+++ b/src/io/input-key-requester.c
@@ -14,7 +14,7 @@
 #include "util/quarks.h"
 #include "util/string-processor.h"
 #include "view/display-messages.h"
-#include "view/main-window-util.h"
+#include "window/main-window-util.h"
 
 /*
  * Keymaps for each "mode" associated with each keypress.

diff --git a/src/io/screen-util.c b/src/io/screen-util.c
index a649b1b..738a115 100644 (file)
--- a/src/io/screen-util.c
+++ b/src/io/screen-util.c
@@ -33,8 +33,8 @@
 #include "term/term-color-types.h"
 #include "util/bit-flags-calculator.h"
 #include "view/display-map.h"
-#include "view/main-window-row-column.h"
-#include "view/main-window-util.h"
+#include "window/main-window-row-column.h"
+#include "window/main-window-util.h"
 #include "world/world.h"
 
 /*!

diff --git a/src/io/targeting.c b/src/io/targeting.c
index ad5e2c6..2dc1fee 100644 (file)
--- a/src/io/targeting.c
+++ b/src/io/targeting.c
@@ -69,7 +69,7 @@
 #include "view/display-lore.h"
 #include "view/display-messages.h"
 #include "view/display-monster-status.h"
-#include "view/main-window-util.h"
+#include "window/main-window-util.h"
 #include "world/world.h"
 #ifdef JP
 #else

diff --git a/src/store/store.c b/src/store/store.c
index 58182b4..444d3f3 100644 (file)
--- a/src/store/store.c
+++ b/src/store/store.c
@@ -90,7 +90,7 @@
 #include "util/object-sort.h"
 #include "util/quarks.h"
 #include "view/display-messages.h"
-#include "view/display-sub-windows.h"
+#include "window/display-sub-windows.h"
 #include "view/object-describer.h"
 #include "world/world.h"
 #ifdef JP

diff --git a/src/view/display-map.c b/src/view/display-map.c
index 72e617f..55e942d 100644 (file)
--- a/src/view/display-map.c
+++ b/src/view/display-map.c
@@ -14,7 +14,7 @@
 #include "object/object-mark-types.h"
 #include "term/term-color-types.h"
 #include "util/bit-flags-calculator.h"
-#include "view/main-window-util.h"
+#include "window/main-window-util.h"
 #include "world/world.h"
 
 byte display_autopick; /*!< 自動拾い状態の設定フラグ */

diff --git a/src/view/display-sub-window-items.c b/src/window/display-sub-window-items.c
similarity index 98%
rename from src/view/display-sub-window-items.c
rename to src/window/display-sub-window-items.c
index a51c8cc..8314b44 100644 (file)
--- a/src/view/display-sub-window-items.c
+++ b/src/window/display-sub-window-items.c
@@ -1,4 +1,4 @@
-#include "view/display-sub-window-items.h"
+#include "window/display-sub-window-items.h"
 #include "flavor/flavor-util.h"
 #include "game-option/text-display-options.h"
 #include "object-enchant/special-object-flags.h"

diff --git a/src/view/display-sub-window-items.h b/src/window/display-sub-window-items.h
similarity index 100%
rename from src/view/display-sub-window-items.h
rename to src/window/display-sub-window-items.h

diff --git a/src/view/display-sub-window-spells.c b/src/window/display-sub-window-spells.c
similarity index 99%
rename from src/view/display-sub-window-spells.c
rename to src/window/display-sub-window-spells.c
index 302fb3f..bd77a78 100644 (file)
--- a/src/view/display-sub-window-spells.c
+++ b/src/window/display-sub-window-spells.c
@@ -1,4 +1,4 @@
-#include "view/display-sub-window-spells.h"
+#include "window/display-sub-window-spells.h"
 #include "core/window-redrawer.h"
 #include "game-option/option-flags.h"
 #include "mind/mind-sniper.h"

diff --git a/src/view/display-sub-window-spells.h b/src/window/display-sub-window-spells.h
similarity index 100%
rename from src/view/display-sub-window-spells.h
rename to src/window/display-sub-window-spells.h

diff --git a/src/view/display-sub-windows.c b/src/window/display-sub-windows.c
similarity index 99%
rename from src/view/display-sub-windows.c
rename to src/window/display-sub-windows.c
index c849e5f..043855a 100644 (file)
--- a/src/view/display-sub-windows.c
+++ b/src/window/display-sub-windows.c
@@ -1,4 +1,4 @@
-#include "view/display-sub-windows.h"
+#include "window/display-sub-windows.h"
 #include "core/window-redrawer.h"
 #include "flavor/flavor-describer.h"
 #include "floor/floor.h"
@@ -27,7 +27,7 @@
 #include "view/display-map.h"
 #include "view/display-messages.h"
 #include "view/display-player.h"
-#include "view/main-window-util.h"
+#include "window/main-window-util.h"
 #include "view/object-describer.h"
 #include "window/main-window-equipments.h"
 #include "world/world.h"

diff --git a/src/view/display-sub-windows.h b/src/window/display-sub-windows.h
similarity index 100%
rename from src/view/display-sub-windows.h
rename to src/window/display-sub-windows.h

diff --git a/src/view/main-window-left-frame.c b/src/window/main-window-left-frame.c
similarity index 98%
rename from src/view/main-window-left-frame.c
rename to src/window/main-window-left-frame.c
index 1f9ee46..ffc01b1 100644 (file)
--- a/src/view/main-window-left-frame.c
+++ b/src/window/main-window-left-frame.c
@@ -1,4 +1,4 @@
-#include "view/main-window-left-frame.h"
+#include "window/main-window-left-frame.h"
 #include "floor/floor.h"
 #include "game-option/special-options.h"
 #include "game-option/text-display-options.h"
@@ -10,9 +10,9 @@
 #include "term/screen-processor.h"
 #include "term/term-color-types.h"
 #include "util/string-processor.h"
-#include "view/main-window-row-column.h"
-#include "view/main-window-stat-poster.h"
-#include "view/main-window-util.h"
+#include "window/main-window-row-column.h"
+#include "window/main-window-stat-poster.h"
+#include "window/main-window-util.h"
 #include "world/world.h"
 
 /*!

diff --git a/src/view/main-window-left-frame.h b/src/window/main-window-left-frame.h
similarity index 100%
rename from src/view/main-window-left-frame.h
rename to src/window/main-window-left-frame.h

diff --git a/src/view/main-window-row-column.h b/src/window/main-window-row-column.h
similarity index 100%
rename from src/view/main-window-row-column.h
rename to src/window/main-window-row-column.h

diff --git a/src/view/main-window-stat-poster.c b/src/window/main-window-stat-poster.c
similarity index 99%
rename from src/view/main-window-stat-poster.c
rename to src/window/main-window-stat-poster.c
index aeaccac..3fd3105 100644 (file)
--- a/src/view/main-window-stat-poster.c
+++ b/src/window/main-window-stat-poster.c
@@ -1,4 +1,4 @@
-#include "view/main-window-stat-poster.h"
+#include "window/main-window-stat-poster.h"
 #include "floor/floor.h"
 #include "io/input-key-requester.h"
 #include "mind/stances-table.h"
@@ -10,7 +10,7 @@
 #include "status/element-resistance.h"
 #include "term/screen-processor.h"
 #include "term/term-color-types.h"
-#include "view/main-window-row-column.h"
+#include "window/main-window-row-column.h"
 #include "view/status-bars-table.h"
 #include "world/world.h"
 

diff --git a/src/view/main-window-stat-poster.h b/src/window/main-window-stat-poster.h
similarity index 100%
rename from src/view/main-window-stat-poster.h
rename to src/window/main-window-stat-poster.h

diff --git a/src/view/main-window-util.c b/src/window/main-window-util.c
similarity index 99%
rename from src/view/main-window-util.c
rename to src/window/main-window-util.c
index 4854030..611b1a9 100644 (file)
--- a/src/view/main-window-util.c
+++ b/src/window/main-window-util.c
@@ -1,4 +1,4 @@
-#include "view/main-window-util.h"
+#include "window/main-window-util.h"
 #include "flavor/flavor-describer.h"
 #include "flavor/object-flavor-types.h"
 #include "floor/floor.h"

diff --git a/src/view/main-window-util.h b/src/window/main-window-util.h
similarity index 100%
rename from src/view/main-window-util.h
rename to src/window/main-window-util.h

diff --git a/src/world/world-turn-processor.c b/src/world/world-turn-processor.c
index 4908308..44a1790 100644 (file)
--- a/src/world/world-turn-processor.c
+++ b/src/world/world-turn-processor.c
@@ -32,7 +32,7 @@
 #include "term/term-color-types.h"
 #include "util/bit-flags-calculator.h"
 #include "view/display-messages.h"
-#include "view/main-window-row-column.h"
+#include "window/main-window-row-column.h"
 #include "world/world-movement-processor.h"
 #include "world/world.h"