Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "patchunicode 1006 と 1047 の取り込み" #745

Closed
wants to merge 1 commit into from
Closed

Revert "patchunicode 1006 と 1047 の取り込み" #745

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 42 additions & 20 deletions sakura_core/cmd/CViewCommander_Cursor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,24 +214,19 @@ int CViewCommander::Command_LEFT( bool bSelect, bool bRepeat )
// 2004.03.28 Moca EOFだけの行以降の途中にカーソルがあると落ちるバグ修正
else if( pcLayout ) {
CMemoryIterator it = GetDocument()->m_cLayoutMgr.CreateCMemoryIterator(pcLayout);
for (; ! it.end(); it.addDelta()) {
while( !it.end() ){
it.scanNext();
if ( ptCaretMove.GetX2() <= it.getColumn() + it.getColumnDelta()) {
if ( it.getColumn() + it.getColumnDelta() > ptCaretMove.GetX2() - 1 ){
ptPos.x += it.getColumnDelta();
break;
}
it.addDelta();
}
ptPos.x += it.getColumn() - it.getColumnDelta();
// Oct. 18, 2002 YAZAKI
if( it.getIndex() >= pcLayout->GetLengthWithEOL() ){
ptPos.x = ptCaretMove.GetX2() - CLayoutXInt(1);
}
if (it.end()) {
const bool has_eol = EOL_NONE != pcLayout->GetLayoutEol(); // 改行文字で終わっているか。
const CLayoutXInt dx_default = this->m_pCommanderView->GetTextMetrics().GetLayoutXDefault(); // 文字のない部分の移動量。
const CLayoutXInt eol_hosei = has_eol ? CLayoutXInt(-it.getColumnDelta() + dx_default) : CLayoutXInt(0);
if (ptCaretMove.GetX2() <= it.getColumn() + eol_hosei) {
ptPos.x = it.getColumn() - it.getColumnDelta();
} else {
ptPos.x = t_max(ptCaretMove.GetX2() - dx_default, it.getColumn() + eol_hosei);
}
} else {
ptPos.x = it.getColumn();
}
}

GetCaret().GetAdjustCursorPos( &ptPos );
Expand Down Expand Up @@ -299,17 +294,14 @@ void CViewCommander::Command_RIGHT( bool bSelect, bool bIgnoreCurrentSelection,
const bool wrapped = EOL_NONE == pcLayout->GetLayoutEol(); // 折り返しているか、改行文字で終わっているか。これにより x_wrapの意味が変わる。
const bool nextline_exists = pcLayout->GetNextLayout() || pcLayout->GetLayoutEol() != EOL_NONE; // EOFのみの行も含め、キャレットが移動可能な次行が存在するか。

const CLayoutXInt dx_default = this->m_pCommanderView->GetTextMetrics().GetLayoutXDefault(); // 文字のない部分(※改行マーク部分を含む)の移動量。

// 現在のキャレットの右の位置( to_x )を求める。
CMemoryIterator it = GetDocument()->m_cLayoutMgr.CreateCMemoryIterator(pcLayout);
for( ; ! it.end(); it.scanNext(), it.addDelta() ) {
if( ptCaret.x < it.getColumn() ) {
break;
}
}
const CLayoutXInt eol_hosei = (it.end() && ! wrapped) ? CLayoutXInt(-it.getColumnDelta() + dx_default) : CLayoutXInt(0);
const CLayoutInt to_x = ptCaret.x < it.getColumn() + eol_hosei ? it.getColumn() + eol_hosei : ptCaret.x + dx_default;
const CLayoutInt to_x = t_max( it.getColumn(), ptCaret.x + 1 );

// キャレットの右端( x_max )と、そこでの扱い( on_x_max )を決める。
CLayoutInt x_max;
Expand All @@ -335,7 +327,7 @@ void CViewCommander::Command_RIGHT( bool bSelect, bool bIgnoreCurrentSelection,
on_x_max = STOP;
}
} else {
if( x_wrap + dx_default < GetDocument()->m_cLayoutMgr.GetMaxLineLayout() ) {
if( x_wrap < GetDocument()->m_cLayoutMgr.GetMaxLineLayout() ) {
x_max = GetDocument()->m_cLayoutMgr.GetMaxLineLayout();
on_x_max = MOVE_NEXTLINE_IMMEDIATELY;
} else { // 改行文字がぶら下がっているときは例外。
Expand Down Expand Up @@ -435,7 +427,24 @@ void CViewCommander::Command_WORDLEFT( bool bSelect )
}

/* 指定された桁に対応する行のデータ内の位置を調べる */
nIdx = m_pCommanderView->LineColumnToIndex( pcLayout, GetCaret().GetCaretLayoutPos().GetX2() );
CLayoutInt layoutEnd;
nIdx = m_pCommanderView->LineColumnToIndex2( pcLayout, GetCaret().GetCaretLayoutPos().GetX2(), &layoutEnd );
// 矩形選択で、EOLより右側のときは１カラム単位で左移動
if( (m_pCommanderView->GetSelectionInfo().IsBoxSelecting() || GetDllShareData().m_Common.m_sGeneral.m_bIsFreeCursorMode)
&& pcLayout->GetLengthWithEOL() <= nIdx ){
if( EOL_NONE != pcLayout->GetLayoutEol() ){
layoutEnd -= CLayoutInt(1);
}
CLayoutPoint ptLayoutNew;
ptLayoutNew.x = t_max(layoutEnd, GetCaret().GetCaretLayoutPos().GetX2() - m_pCommanderView->GetTextMetrics().GetLayoutXDefault());
ptLayoutNew.y = GetCaret().GetCaretLayoutPos().GetY2();
GetCaret().MoveCursor(ptLayoutNew, true);
if( bSelect ){
m_pCommanderView->GetSelectionInfo().ChangeSelectAreaByCurrentCursor(ptLayoutNew);
}
GetCaret().m_nCaretPosX_Prev = GetCaret().GetCaretLayoutPos().GetX2();
return;
}

/* 現在位置の左の単語の先頭位置を調べる */
CLayoutPoint ptLayoutNew;
Expand Down Expand Up @@ -550,6 +559,19 @@ try_again:;
GetCaret().m_nCaretPosX_Prev = GetCaret().GetCaretLayoutPos().GetX2();
}
else{
// 矩形選択/フリーカーソルで、EOLより右側のときは１カラム単位で右移動
if( (m_pCommanderView->GetSelectionInfo().IsBoxSelecting() || GetDllShareData().m_Common.m_sGeneral.m_bIsFreeCursorMode) &&
pcLayout->GetLengthWithEOL() <= nIdx ){
ptLayoutNew.x = t_min(GetCaret().GetCaretLayoutPos().GetX2() + m_pCommanderView->GetTextMetrics().GetLayoutXDefault(),
m_pCommanderView->GetDocument()->m_cLayoutMgr.GetMaxLineLayout() );
ptLayoutNew.y = GetCaret().GetCaretLayoutPos().GetY2();
GetCaret().MoveCursor(ptLayoutNew, true);
if( bSelect ){
m_pCommanderView->GetSelectionInfo().ChangeSelectAreaByCurrentCursor(ptLayoutNew);
}
GetCaret().m_nCaretPosX_Prev = GetCaret().GetCaretLayoutPos().GetX2();
return;
}
bool bIsFreeCursorModeOld = GetDllShareData().m_Common.m_sGeneral.m_bIsFreeCursorMode; /* フリーカーソルモードか */
GetDllShareData().m_Common.m_sGeneral.m_bIsFreeCursorMode = false;
/* カーソル右移動 */
Expand Down