From 7b916f54a3d357f700ee08e812b1582df3195fdf Mon Sep 17 00:00:00 2001
From: k3tamina <k3tak3ta@gmail.com>
Date: Tue, 5 Jul 2022 08:20:56 +0200
Subject: [PATCH] Cleanup window_manager_private.h (#58)

---
 src/window_manager_private.cc | 51 +++++++++++++++++++++++++----------
 src/window_manager_private.h  | 37 -------------------------
 2 files changed, 37 insertions(+), 51 deletions(-)

diff --git a/src/window_manager_private.cc b/src/window_manager_private.cc
index 6e2a423..4907264 100644
--- a/src/window_manager_private.cc
+++ b/src/window_manager_private.cc
@@ -10,51 +10,74 @@
 
 #include <algorithm>
 
+typedef struct STRUCT_6B2340 {
+    int field_0;
+    int field_4;
+} STRUCT_6B2340;
+
+typedef struct STRUCT_6B2370 {
+    int field_0;
+    // win
+    int field_4;
+    int field_8;
+} STRUCT_6B2370;
+
+static void _win_debug_delete();
+static int _win_register_menu_bar(int win, int x, int y, int width, int height, int a6, int a7);
+static int _win_register_menu_pulldown(int win, int x, char* str, int a4);
+static int _win_width_needed(char** fileNameList, int fileNameListLength);
+static int _calc_max_field_chars_wcursor(int a1, int a2);
+static void _tm_watch_msgs();
+static void _tm_kill_msg();
+static void _tm_kill_out_of_order(int a1);
+static void _tm_click_response(int btn);
+static int _tm_index_active(int a1);
+
 // 0x51E414
-int _wd = -1;
+static int _wd = -1;
 
 // 0x51E418
-int _curr_menu = 0;
+static int _curr_menu = 0;
 
 // 0x51E41C
-bool _tm_watch_active = false;
+static bool _tm_watch_active = false;
 
 // 0x6B2340
-STRUCT_6B2340 _tm_location[5];
+static STRUCT_6B2340 _tm_location[5];
 
 // 0x6B2368
-int _tm_text_x;
+static int _tm_text_x;
 
 // 0x6B236C
-int _tm_h;
+static int _tm_h;
 
 // 0x6B2370
-STRUCT_6B2370 _tm_queue[5];
+static STRUCT_6B2370 _tm_queue[5];
 
 // 0x6B23AC
-int _tm_persistence;
+static int _tm_persistence;
 
 // 0x6B23B0
-int _scr_center_x;
+static int _scr_center_x;
 
 // 0x6B23B4
-int _tm_text_y;
+static int _tm_text_y;
 
 // 0x6B23B8
-int _tm_kill;
+static int _tm_kill;
 
 // 0x6B23BC
-int _tm_add;
+static int _tm_add;
 
 // x
 //
 // 0x6B23C0
-int _curry;
+static int _curry;
 
 // y
 //
 // 0x6B23C4
-int _currx;
+static int _currx;
 
 // 0x6B23D0
 char gProgramWindowTitle[256];
diff --git a/src/window_manager_private.h b/src/window_manager_private.h
index c199ca7..8231b6e 100644
--- a/src/window_manager_private.h
+++ b/src/window_manager_private.h
@@ -3,48 +3,11 @@
 
 typedef struct struc_177 struc_177;
 
-typedef struct STRUCT_6B2340 {
-    int field_0;
-    int field_4;
-} STRUCT_6B2340;
-
-typedef struct STRUCT_6B2370 {
-    int field_0;
-    // win
-    int field_4;
-    int field_8;
-} STRUCT_6B2370;
-
-extern int _wd;
-extern int _curr_menu;
-extern bool _tm_watch_active;
-
-extern STRUCT_6B2340 _tm_location[5];
-extern int _tm_text_x;
-extern int _tm_h;
-extern STRUCT_6B2370 _tm_queue[5];
-extern int _tm_persistence;
-extern int _scr_center_x;
-extern int _tm_text_y;
-extern int _tm_kill;
-extern int _tm_add;
-extern int _curry;
-extern int _currx;
 extern char gProgramWindowTitle[256];
 
 int _win_debug(char* a1);
-void _win_debug_delete();
-int _win_register_menu_bar(int win, int x, int y, int width, int height, int a6, int a7);
-int _win_register_menu_pulldown(int win, int x, char* str, int a4);
-int _win_width_needed(char** fileNameList, int fileNameListLength);
 int _GNW_process_menu(struc_177* ptr, int i);
-int _calc_max_field_chars_wcursor(int a1, int a2);
 void _GNW_intr_init();
 void _GNW_intr_exit();
-void _tm_watch_msgs();
-void _tm_kill_msg();
-void _tm_kill_out_of_order(int a1);
-void _tm_click_response(int btn);
-int _tm_index_active(int a1);
 
 #endif /* WINDOW_MANAGER_PRIVATE_H */