Change to build OpenSSL by ourselves to support Windows XP and earlier.

[ffftp/ffftp.git] / taskwin.c

diff --git a/taskwin.c b/taskwin.c
index 9e269d3..a8a6ae1 100644 (file)
--- a/taskwin.c
+++ b/taskwin.c
@@ -45,8 +45,7 @@
 #include "common.h"\r
 #include "resource.h"\r
 \r
-// Windows 9x系をサポートしないため不要\r
-//#define TASK_BUFSIZE (16*1024)\r
+#define TASK_BUFSIZE   (16*1024)\r
 \r
 \r
 \r
@@ -61,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
@@ -86,10 +87,16 @@ 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
@@ -184,6 +191,7 @@ void SetTaskMsg(char *szFormat, ...)
 \r
                                /* テキストサイズのリミット値をチェック */\r
                                // Windows 9x系をサポートしないため不要\r
+                               // 古い処理内容を消去\r
 //                             if((Pos + strlen(szBuf)) >= TASK_BUFSIZE)\r
 //                             {\r
 //                                     /* リミットを越えそうなら、先頭部分を切り捨てる */\r
@@ -194,6 +202,16 @@ void SetTaskMsg(char *szFormat, ...)
 //\r
 //                                     Pos = SendMessage(GetTaskWnd(), WM_GETTEXTLENGTH, 0, 0);\r
 //                             }\r
+                               if(RemoveOldLog == YES)\r
+                               {\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
                                SendMessage(GetTaskWnd(), EM_REPLACESEL, FALSE, (LPARAM)szBuf);\r