Remove typedef OriginalWindowPosition_t in Commands.h. Make MAX_WINDOW

constant and use it as the size of m_OriginalWindowPosition in CCommands.

diff --git a/xkeymacsdll/Commands.cpp b/xkeymacsdll/Commands.cpp
index 1e12868..732909f 100644 (file)
--- a/xkeymacsdll/Commands.cpp
+++ b/xkeymacsdll/Commands.cpp
@@ -289,7 +289,7 @@ CPtrList CCommands::m_FindText;
 BOOL CCommands::m_bFirstFindDialog = FALSE;\r
 BOOL CCommands::m_bTemporarilyDisableXKeymacs = FALSE;\r
 CArray<CClipboardSnap *, CClipboardSnap *> CCommands::m_oClipboardData;\r
-OriginalWindowPosition_t CCommands::m_OriginalWindowPosition[MAX_WINDOW] = {'\0'};\r
+OriginalWindowPosition CCommands::m_OriginalWindowPosition[MAX_WINDOW] = {'\0'};\r
 BOOL CCommands::m_bIsSu = FALSE;\r
 #pragma data_seg()\r
 \r
@@ -1181,8 +1181,8 @@ int CCommands::SaveBuffersKillEmacs()
 \r
        HWND hWnd = GetForegroundWindow();\r
        if (hWnd) {\r
-               OriginalWindowPosition_t *pOriginalWindowPosition = GetOriginalWindowPosition(hWnd);\r
-               if (pOriginalWindowPosition && pOriginalWindowPosition->bMax[ROLL_UP_UNROLL]) {\r
+               OriginalWindowPosition *pPos = GetOriginalWindowPosition(hWnd);\r
+               if (pPos && pPos->bMax[ROLL_UP_UNROLL]) {\r
                        RollUpUnroll();\r
                }\r
        }\r
@@ -1277,20 +1277,18 @@ int CCommands::Maximize()
        return Reset(GOTO_HOOK);\r
 }\r
 \r
-OriginalWindowPosition_t* CCommands::GetOriginalWindowPosition(HWND hWnd)\r
+OriginalWindowPosition* CCommands::GetOriginalWindowPosition(HWND hWnd)\r
 {\r
-       const int nOriginalWindowPosition = sizeof(m_OriginalWindowPosition) / sizeof(m_OriginalWindowPosition[0]);\r
-\r
-       for (int i = 0; i < nOriginalWindowPosition; ++i) {\r
+       for (int i = 0; i < MAX_WINDOW; i++) {\r
                if (m_OriginalWindowPosition[i].hWnd == hWnd) {\r
                        return &m_OriginalWindowPosition[i];\r
                }\r
        }\r
 \r
-       for (int j = 0; j < nOriginalWindowPosition; ++j) {\r
+       for (int j = 0; j < MAX_WINDOW; j++) {\r
                if (m_OriginalWindowPosition[j].hWnd == 0) {\r
                        m_OriginalWindowPosition[j].hWnd = hWnd;\r
-                       memset(&m_OriginalWindowPosition[(j + 1) % nOriginalWindowPosition], 0, sizeof(m_OriginalWindowPosition[0]));\r
+                       memset(&m_OriginalWindowPosition[(j + 1) % MAX_WINDOW], 0, sizeof(OriginalWindowPosition));\r
                        return &m_OriginalWindowPosition[j];\r
                }\r
        }\r
@@ -1318,8 +1316,8 @@ int CCommands::Maximize(MAXIMIZE_DIRECTION direction)
                return Reset(GOTO_HOOK);\r
        }\r
 \r
-       OriginalWindowPosition_t *pOriginalWindowPosition = GetOriginalWindowPosition(hWnd);\r
-       if (!pOriginalWindowPosition) {\r
+       OriginalWindowPosition *pPos = GetOriginalWindowPosition(hWnd);\r
+       if (!pPos) {\r
                return Reset(GOTO_HOOK);\r
        }\r
 \r
@@ -1330,34 +1328,34 @@ int CCommands::Maximize(MAXIMIZE_DIRECTION direction)
 \r
        switch (direction) {\r
        case VERTICAL:\r
-               if (pOriginalWindowPosition->bMax[direction]) {\r
-                       Y = pOriginalWindowPosition->nOriginalY;\r
-                       nHeight = pOriginalWindowPosition->nOriginalHeight;\r
+               if (pPos->bMax[direction]) {\r
+                       Y = pPos->nOriginalY;\r
+                       nHeight = pPos->nOriginalHeight;\r
                } else {\r
-                       pOriginalWindowPosition->nOriginalY = Y;\r
-                       pOriginalWindowPosition->nOriginalHeight = nHeight;\r
+                       pPos->nOriginalY = Y;\r
+                       pPos->nOriginalHeight = nHeight;\r
 \r
                        Y = workarea.top;\r
                        nHeight = workarea.bottom - workarea.top;\r
                }\r
                break;\r
        case HORIZONTAL:\r
-               if (pOriginalWindowPosition->bMax[direction]) {\r
-                       X = pOriginalWindowPosition->nOriginalX;\r
-                       nWidth = pOriginalWindowPosition->nOriginalWidth;\r
+               if (pPos->bMax[direction]) {\r
+                       X = pPos->nOriginalX;\r
+                       nWidth = pPos->nOriginalWidth;\r
                } else {\r
-                       pOriginalWindowPosition->nOriginalX = X;\r
-                       pOriginalWindowPosition->nOriginalWidth = nWidth;\r
+                       pPos->nOriginalX = X;\r
+                       pPos->nOriginalWidth = nWidth;\r
 \r
                        X = workarea.left;\r
                        nWidth = workarea.right - workarea.left;\r
                }\r
                break;\r
        case ROLL_UP_UNROLL:\r
-               if (pOriginalWindowPosition->bMax[direction]) {\r
-                       nHeight = pOriginalWindowPosition->nOriginalHeight;\r
+               if (pPos->bMax[direction]) {\r
+                       nHeight = pPos->nOriginalHeight;\r
                } else {\r
-                       pOriginalWindowPosition->nOriginalHeight = nHeight;\r
+                       pPos->nOriginalHeight = nHeight;\r
 \r
                        nHeight = 0x15;\r
                }\r
@@ -1368,7 +1366,7 @@ int CCommands::Maximize(MAXIMIZE_DIRECTION direction)
        }\r
 \r
        MoveWindow(hWnd, X, Y, nWidth, nHeight, TRUE);\r
-       pOriginalWindowPosition->bMax[direction] = !pOriginalWindowPosition->bMax[direction];\r
+       pPos->bMax[direction] = !pPos->bMax[direction];\r
        return Reset(GOTO_HOOK);\r
 }\r
 \r

diff --git a/xkeymacsdll/Commands.h b/xkeymacsdll/Commands.h
index 2782eee..a03ea33 100644 (file)
--- a/xkeymacsdll/Commands.h
+++ b/xkeymacsdll/Commands.h
@@ -16,10 +16,10 @@ enum MAXIMIZE_DIRECTION { VERTICAL, HORIZONTAL, ROLL_UP_UNROLL, MAX_MAXIMIZE_DIR
 enum INPUT_METHOD_OPEN_STATUS {CLOSE_INPUT_METHOD, OPEN_INPUT_METHOD, TOGGLE_INPUT_METHOD};\r
 enum CONSOLE_MENU_EDIT { CMD_MARK = 1, CMD_COPY, CMD_PASTE, CMD_SELECT_ALL, CMD_SCROLL, CMD_FIND };\r
 enum CONSOLE_MENU { CMD_RESTORE = 1, CMD_MOVE, CMD_SIZE, CMD_MINIMIZE, CMD_MAXIMIZE, CMD_CLOSE, CMD_EDIT, CMD_DEFAULTS, CMD_PROPERTIES };\r
-enum { MAX_WINDOW = 64 };\r
 enum CASE_WORD { DOWNCASE, UPCASE, CAPITALIZE };\r
+const int MAX_WINDOW = 64;\r
 \r
-typedef struct OriginalWindowPosition\r
+struct OriginalWindowPosition\r
 {\r
        HWND hWnd;\r
        BOOL bMax[MAX_MAXIMIZE_DIRECTION];\r
@@ -27,7 +27,7 @@ typedef struct OriginalWindowPosition
        int nOriginalY;                 // for VERTICAL\r
        int nOriginalWidth;             // for HORIZONTAL\r
        int nOriginalHeight;    // for VERTICAL\r
-} OriginalWindowPosition_t;\r
+};\r
 \r
 class AFX_EXT_CLASS CCommands  \r
 {\r
@@ -181,8 +181,8 @@ private:
        static BOOL GetCaretPos(LPPOINT lpPoint);\r
        static BOOL IsKillCommand(int (*nFunctionPointer)());\r
        static void PrintFunctionName(int (*nFunctionPointer)());\r
-       static OriginalWindowPosition_t* GetOriginalWindowPosition(HWND hWnd);\r
-       static OriginalWindowPosition_t m_OriginalWindowPosition[MAX_WINDOW];\r
+       static OriginalWindowPosition* GetOriginalWindowPosition(HWND hWnd);\r
+       static OriginalWindowPosition m_OriginalWindowPosition[MAX_WINDOW];\r
        static int KillLine(BOOL bAllFormat, int (*pCommand)() = KillLine);\r
        static BOOL IsEmptyClipboardData(const int nID = 0);\r
        static int FindReturnFromClipboardData(const int nID = 0);\r