admin/SimpleRemoter
1
0
Fork 0
mirror of https://github.com/yuanyuanxiang/SimpleRemoter.git synced 2026-01-23 07:43:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: #288 Command line issues

Browse Source
This commit is contained in:
yuanyuanxiang
2026-01-18 11:02:56 +01:00
parent 13a09e8451
commit 0b65a24ac2
3 changed files with 35 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/ShellManager.cpp
View File

@@ -124,8 +124,10 @@ DWORD WINAPI CShellManager::ReadPipeThread(LPVOID lParam)
#ifdef _DEBUG #ifdef _DEBUG
Mprintf("===> Input length= %d \n", This->m_nCmdLength); Mprintf("===> Input length= %d \n", This->m_nCmdLength);
#endif #endif
const char *pStart = (char*)szTotalBuffer + This->m_nCmdLength; int skipBytes = min(This->m_nCmdLength, (int)dwReturn);
int length = int(dwReturn) - This->m_nCmdLength; const char *pStart = (char*)szTotalBuffer + skipBytes;
int length = (int)dwReturn - skipBytes;
This->m_nCmdLength -= skipBytes;
if (length > 0) if (length > 0)
This->m_ClientObject->Send2Server(pStart, length); This->m_ClientObject->Send2Server(pStart, length);

33
server/2015Remote/ShellDlg.cpp
View File

@@ -14,9 +14,15 @@ END_MESSAGE_MAP()
void CAutoEndEdit::OnChar(UINT nChar, UINT nRepCnt, UINT nFlags) void CAutoEndEdit::OnChar(UINT nChar, UINT nRepCnt, UINT nFlags)
{ {
// 将光标移动到文本末尾 // 获取当前光标位置
int nLength = GetWindowTextLength(); int nStart, nEnd;
SetSel(nLength, nLength); GetSel(nStart, nEnd);
// 如果光标在最小可编辑位置之前，移动到末尾
if (nStart < (int)m_nMinEditPos) {
int nLength = GetWindowTextLength();
SetSel(nLength, nLength);
}
// 调用父类处理输入字符 // 调用父类处理输入字符
CEdit::OnChar(nChar, nRepCnt, nFlags); CEdit::OnChar(nChar, nRepCnt, nFlags);
@@ -70,6 +76,7 @@ BOOL CShellDlg::OnInitDialog()
m_Edit.SetWindowTextA(">>"); m_Edit.SetWindowTextA(">>");
m_nCurSel = m_Edit.GetWindowTextLengthA(); m_nCurSel = m_Edit.GetWindowTextLengthA();
m_nReceiveLength = m_nCurSel; m_nReceiveLength = m_nCurSel;
m_Edit.m_nMinEditPos = m_nReceiveLength; // 设置最小可编辑位置
m_Edit.SetSel((int)m_nCurSel, (int)m_nCurSel); m_Edit.SetSel((int)m_nCurSel, (int)m_nCurSel);
m_Edit.PostMessage(EM_SETSEL, m_nCurSel, m_nCurSel); m_Edit.PostMessage(EM_SETSEL, m_nCurSel, m_nCurSel);
m_Edit.SetLimitText(EDIT_MAXLENGTH); m_Edit.SetLimitText(EDIT_MAXLENGTH);
@@ -87,6 +94,7 @@ VOID CShellDlg::OnReceiveComplete()
AddKeyBoardData(); AddKeyBoardData();
m_nReceiveLength = m_Edit.GetWindowTextLength(); m_nReceiveLength = m_Edit.GetWindowTextLength();
m_Edit.m_nMinEditPos = m_nReceiveLength; // 更新最小可编辑位置
} }
@@ -197,6 +205,7 @@ BOOL CShellDlg::PreTranslateMessage(MSG* pMsg)
m_Edit.SetWindowTextA(str); m_Edit.SetWindowTextA(str);
m_nCurSel = m_Edit.GetWindowTextLength(); m_nCurSel = m_Edit.GetWindowTextLength();
m_nReceiveLength = m_nCurSel; m_nReceiveLength = m_nCurSel;
m_Edit.m_nMinEditPos = m_nReceiveLength; // 更新最小可编辑位置
m_Edit.SetSel(m_nCurSel, m_nCurSel); m_Edit.SetSel(m_nCurSel, m_nCurSel);
return TRUE; return TRUE;
} }
@@ -209,8 +218,22 @@ BOOL CShellDlg::PreTranslateMessage(MSG* pMsg)
if (m_Edit.GetWindowTextLength() <= m_nReceiveLength) if (m_Edit.GetWindowTextLength() <= m_nReceiveLength)
return true; return true;
} }
// 示例： // 限制VK_LEFT - 不能移动到历史输出区域
//dir\r\n 5 if (pMsg->wParam == VK_LEFT && pMsg->hwnd == m_Edit.m_hWnd) {
int nStart, nEnd;
m_Edit.GetSel(nStart, nEnd);
if (nStart <= (int)m_nReceiveLength)
return true;
}
// 限制VK_UP - 禁止向上移动到历史输出
if (pMsg->wParam == VK_UP && pMsg->hwnd == m_Edit.m_hWnd) {
return true;
}
// 限制VK_HOME - 移动到当前命令行开始位置而不是文本开头
if (pMsg->wParam == VK_HOME && pMsg->hwnd == m_Edit.m_hWnd) {
m_Edit.SetSel((int)m_nReceiveLength, (int)m_nReceiveLength);
return true;
}
} }
return CDialog::PreTranslateMessage(pMsg); return CDialog::PreTranslateMessage(pMsg);

4
server/2015Remote/ShellDlg.h
View File

@@ -2,10 +2,12 @@
#include "IOCPServer.h" #include "IOCPServer.h"
#include "afxwin.h" #include "afxwin.h"
// 无论光标位置在哪，新输入的文字总是出现在文本末尾 // 限制光标不能移动到历史输出区域，只能在当前命令行内编辑
class CAutoEndEdit : public CEdit class CAutoEndEdit : public CEdit
{ {
public: public:
CAutoEndEdit() : m_nMinEditPos(0) {}
UINT m_nMinEditPos; // 最小可编辑位置（历史输出的末尾）
afx_msg void OnChar(UINT nChar, UINT nRepCnt, UINT nFlags); afx_msg void OnChar(UINT nChar, UINT nRepCnt, UINT nFlags);
DECLARE_MESSAGE_MAP() DECLARE_MESSAGE_MAP()
}; };