Enhance all settings encryption.

[ffftp/ffftp.git] / taskwin.c

diff --git a/taskwin.c b/taskwin.c
index 1465aa3..a8a6ae1 100644 (file)
--- a/taskwin.c
+++ b/taskwin.c
@@ -28,6 +28,8 @@
 /============================================================================*/\r
 \r
 #define  STRICT\r
+// IPv6対応\r
+#include <winsock2.h>\r
 #include <windows.h>\r
 #include <stdio.h>\r
 #include <stdlib.h>\r
@@ -37,7 +39,8 @@
 #include <windowsx.h>\r
 #include <commctrl.h>\r
 #include <stdarg.h>\r
-#include <winsock.h>\r
+// IPv6対応\r
+//#include <winsock.h>\r
 \r
 #include "common.h"\r
 #include "resource.h"\r
@@ -57,6 +60,8 @@ extern int ListHeight;
 extern int TaskHeight;\r
 extern HFONT ListFont;\r
 extern int DebugConsole;\r
+// 古い処理内容を消去\r
+extern int RemoveOldLog;\r
 \r
 /*===== ローカルなワーク =====*/\r
 \r
@@ -82,15 +87,23 @@ int MakeTaskWindow(HWND hWnd, HINSTANCE hInst)
        int Sts;\r
 \r
        Sts = FFFTP_FAIL;\r
+       // 高DPI対応\r
+//     hWndTask = CreateWindowEx(/*WS_EX_STATICEDGE*/WS_EX_CLIENTEDGE,\r
+//                     "EDIT", NULL,\r
+//                     WS_CHILD | WS_BORDER | ES_AUTOVSCROLL | WS_VSCROLL | ES_MULTILINE | ES_READONLY | WS_CLIPSIBLINGS,\r
+//                     0, TOOLWIN_HEIGHT*2+ListHeight+SepaWidth, ClientWidth, TaskHeight,\r
+//                     hWnd, (HMENU)1500, hInst, NULL);\r
        hWndTask = CreateWindowEx(/*WS_EX_STATICEDGE*/WS_EX_CLIENTEDGE,\r
                        "EDIT", NULL,\r
                        WS_CHILD | WS_BORDER | ES_AUTOVSCROLL | WS_VSCROLL | ES_MULTILINE | ES_READONLY | WS_CLIPSIBLINGS,\r
-                       0, TOOLWIN_HEIGHT*2+ListHeight+SepaWidth, ClientWidth, TaskHeight,\r
+                       0, AskToolWinHeight()*2+ListHeight+SepaWidth, ClientWidth, TaskHeight,\r
                        hWnd, (HMENU)1500, hInst, NULL);\r
 \r
        if(hWndTask != NULL)\r
        {\r
-               SendMessage(hWndTask, EM_LIMITTEXT, TASK_BUFSIZE, 0);\r
+               // Windows 9x系をサポートしないため不要\r
+//             SendMessage(hWndTask, EM_LIMITTEXT, TASK_BUFSIZE, 0);\r
+               SendMessage(hWndTask, EM_LIMITTEXT, 0x7fffffff, 0);\r
 \r
                if(ListFont != NULL)\r
                        SendMessage(hWndTask, WM_SETFONT, (WPARAM)ListFont, MAKELPARAM(TRUE, 0));\r
@@ -177,15 +190,27 @@ void SetTaskMsg(char *szFormat, ...)
                                Pos = SendMessage(GetTaskWnd(), WM_GETTEXTLENGTH, 0, 0);\r
 \r
                                /* テキストサイズのリミット値をチェック */\r
-                               if((Pos + strlen(szBuf)) >= TASK_BUFSIZE)\r
+                               // Windows 9x系をサポートしないため不要\r
+                               // 古い処理内容を消去\r
+//                             if((Pos + strlen(szBuf)) >= TASK_BUFSIZE)\r
+//                             {\r
+//                                     /* リミットを越えそうなら、先頭部分を切り捨てる */\r
+//                                     Pos = SendMessage(GetTaskWnd(), EM_LINEFROMCHAR, TASK_BUFSIZE/10, 0) + 1;\r
+//                                     Pos = SendMessage(GetTaskWnd(), EM_LINEINDEX, Pos, 0);\r
+//                                     SendMessage(GetTaskWnd(), EM_SETSEL, 0, Pos);\r
+//                                     SendMessage(GetTaskWnd(), EM_REPLACESEL, FALSE, (LPARAM)"");\r
+//\r
+//                                     Pos = SendMessage(GetTaskWnd(), WM_GETTEXTLENGTH, 0, 0);\r
+//                             }\r
+                               if(RemoveOldLog == YES)\r
                                {\r
-                                       /* リミットを越えそうなら、先頭部分を切り捨てる */\r
-                                       Pos = SendMessage(GetTaskWnd(), EM_LINEFROMCHAR, TASK_BUFSIZE/10, 0) + 1;\r
-                                       Pos = SendMessage(GetTaskWnd(), EM_LINEINDEX, Pos, 0);\r
-                                       SendMessage(GetTaskWnd(), EM_SETSEL, 0, Pos);\r
-                                       SendMessage(GetTaskWnd(), EM_REPLACESEL, FALSE, (LPARAM)"");\r
-\r
-                                       Pos = SendMessage(GetTaskWnd(), WM_GETTEXTLENGTH, 0, 0);\r
+                                       if((Pos + strlen(szBuf)) >= TASK_BUFSIZE)\r
+                                       {\r
+                                               Pos = SendMessage(GetTaskWnd(), EM_LINEINDEX, 1, 0);\r
+                                               SendMessage(GetTaskWnd(), EM_SETSEL, 0, Pos);\r
+                                               SendMessage(GetTaskWnd(), EM_REPLACESEL, FALSE, (LPARAM)"");\r
+                                               Pos = SendMessage(GetTaskWnd(), WM_GETTEXTLENGTH, 0, 0);\r
+                                       }\r
                                }\r
 \r
                                SendMessage(GetTaskWnd(), EM_SETSEL, Pos, Pos);\r