コミット: f7f66a0e6272bd7b89ffa24a02045b76b604f0a0 - Osdn (git)

Loweynet

コミットメタ情報

• リビジョン: f7f66a0e6272bd7b89ffa24a02045b76b604f0a0 (tree)
• 日時: 2012-09-06 15:50:31
• 作者: s_kawamoto <s_kawamoto@user...>
• コミッター: s_kawamoto

ログメッセージ

Change the behavior of automatic update of the local view.

変更サマリ

• modified: FFFTP_Eng_Release/FFFTP.exe
• modified: Release/FFFTP.exe
• modified: common.h
• modified: filelist.c
• modified: main.c
• modified: misc.c

差分

Binary files a/FFFTP_Eng_Release/FFFTP.exe and b/FFFTP_Eng_Release/FFFTP.exe differ

Binary files a/Release/FFFTP.exe and b/Release/FFFTP.exe differ

--- a/common.h
+++ b/common.h
@@ -1366,6 +1366,9 @@ int GetItemCount(int Win);
 int GetSelectedCount(int Win);
 int GetFirstSelected(int Win, int All);
 int GetNextSelected(int Win, int Pos, int All);
+// ローカル側自動更新
+int GetHotSelected(int Win, char *Fname);
+int SetHotSelected(int Win, char *Fname);
 int FindNameNode(int Win, char *Name);
 void GetNodeName(int Win, int Pos, char *Buf, int Max);
 int GetNodeTime(int Win, int Pos, FILETIME *Buf);

--- a/filelist.c
+++ b/filelist.c
@@ -2337,6 +2337,58 @@ int GetNextSelected(int Win, int Pos, int All)
 }
 
 
+// ローカル側自動更新
+int GetHotSelected(int Win, char *Fname)
+{
+	HWND hWnd;
+	int Pos;
+
+	hWnd = GetLocalHwnd();
+	if(Win == WIN_REMOTE)
+		hWnd = GetRemoteHwnd();
+
+	Pos = SendMessage(hWnd, LVM_GETNEXTITEM, (WPARAM)-1, (LPARAM)MAKELPARAM(LVNI_FOCUSED, 0));
+	if(Pos != -1)
+		GetNodeName(Win, Pos, Fname, FMAX_PATH);
+
+	return Pos;
+}
+
+int SetHotSelected(int Win, char *Fname)
+{
+	HWND hWnd;
+	int i;
+	int Num;
+	char Name[FMAX_PATH+1];
+	LV_ITEM LvItem;
+	int Pos;
+
+	hWnd = GetLocalHwnd();
+	if(Win == WIN_REMOTE)
+		hWnd = GetRemoteHwnd();
+
+	Num = GetItemCount(Win);
+	memset(&LvItem, 0, sizeof(LV_ITEM));
+	Pos = -1;
+	for(i = 0; i < Num; i++)
+	{
+		LvItem.state = 0;
+		GetNodeName(Win, i, Name, FMAX_PATH);
+		if(_mbscmp(Fname, Name) == 0)
+		{
+			Pos = i;
+			LvItem.state = LVIS_FOCUSED;
+		}
+		LvItem.mask = LVIF_STATE;
+		LvItem.iItem = i;
+		LvItem.stateMask = LVIS_FOCUSED;
+		LvItem.iSubItem = 0;
+		SendMessage(hWnd, LVM_SETITEMSTATE, i, (LPARAM)&LvItem);
+	}
+
+	return Pos;
+}
+
 /*----- 指定された名前のアイテムを探す ----------------------------------------
 *
 *	Parameter

--- a/main.c
+++ b/main.c
@@ -925,11 +925,18 @@ static LRESULT CALLBACK FtpWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARA
 					if(AskUserOpeDisabled() == NO)
 					{
 						FILELIST* Base;
+						char Name[FMAX_PATH+1];
+						int Pos;
 						FindNextChangeNotification(ChangeNotification);
 						Base = NULL;
 						MakeSelectedFileList(WIN_LOCAL, NO, NO, &Base, &CancelFlg);
+						GetHotSelected(WIN_LOCAL, Name);
+						Pos = SendMessage(GetLocalHwnd(), LVM_GETTOPINDEX, 0, 0);
 						GetLocalDirForWnd();
 						SelectFileInList(GetLocalHwnd(), SELECT_LIST, Base);
+						SetHotSelected(WIN_LOCAL, Name);
+						SendMessage(GetLocalHwnd(), LVM_ENSUREVISIBLE, (WPARAM)(SendMessage(GetLocalHwnd(), LVM_GETITEMCOUNT, 0, 0) - 1), (LPARAM)TRUE);
+						SendMessage(GetLocalHwnd(), LVM_ENSUREVISIBLE, (WPARAM)Pos, (LPARAM)TRUE);
 					}
 				}
 				break;

--- a/misc.c
+++ b/misc.c
@@ -1333,6 +1333,8 @@ int SelectFile(HWND hWnd, char *Fname, char *Title, char *Filters, char *Ext, in
 	GetCurrentDirectory(FMAX_PATH, Cur);
 
 	strcpy(Tmp, Fname);
+	// 変数が未初期化のバグ修正
+	memset(&OpenFile, 0, sizeof(OPENFILENAME));
 	OpenFile.lStructSize = sizeof(OPENFILENAME);
 	OpenFile.hwndOwner = hWnd;
 	OpenFile.hInstance = 0;