Skip to content

Commit

Permalink
Change プレフィックスを NK から NKMM に変更
Browse files Browse the repository at this point in the history
  • Loading branch information
niki committed Apr 5, 2024
1 parent fccbe9a commit 6348ca6
Show file tree
Hide file tree
Showing 105 changed files with 1,119 additions and 1,119 deletions.
4 changes: 2 additions & 2 deletions sakura_core/CDataProfile.h
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,10 @@ typedef const StringBufferW_ StringBufferW;
//2007.09.24 kobake データ変換部を子クラスに分離
//!各種データ変換付きCProfile
class CDataProfile : public CProfile{
#ifdef NK_FIX_PROFILES
#ifdef NKMM_FIX_PROFILES
public:
void *tag_;
#endif // NK_
#endif // NKMM_
private:
//専用型
typedef std::wstring wstring;
Expand Down
12 changes: 6 additions & 6 deletions sakura_core/CEol.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -58,21 +58,21 @@ struct SEolDefinition{
};
static const SEolDefinition g_aEolTable[] = {
{ _T("改行無"), L"", "", 0 },
#ifdef NK_FIX_STATUSBAR
#ifdef NKMM_FIX_STATUSBAR
{ _T("Win"), L"\x0d\x0a", "\x0d\x0a", 2 },
{ _T("Unix"), L"\x0a", "\x0a", 1 },
{ _T("Mac"), L"\x0d", "\x0d", 1 },
#else
{ _T("CRLF"), L"\x0d\x0a", "\x0d\x0a", 2 },
{ _T("LF"), L"\x0a", "\x0a", 1 },
{ _T("CR"), L"\x0d", "\x0d", 1 },
#endif // NK_
#endif // NKMM_
{ _T("NEL"), L"\x85", "", 1 },
{ _T("LS"), L"\u2028", "", 1 },
{ _T("PS"), L"\u2029", "", 1 },
};

#ifdef NK_FIX_STATUSBAR
#ifdef NKMM_FIX_STATUSBAR
static const SEolDefinition g_aEolTable2[] = {
{ _T("改行無"), L"", "", 0 },
{ _T("0D0A(CRLF)"), L"\x0d\x0a", "\x0d\x0a", 2 },
Expand All @@ -82,7 +82,7 @@ static const SEolDefinition g_aEolTable2[] = {
{ _T("u2028(LS)"), L"\u2028", "", 1 },
{ _T("u2029(PS)"), L"\u2029", "", 1 },
};
#endif // NK_
#endif // NKMM_


struct SEolDefinitionForUniFile{
Expand Down Expand Up @@ -166,12 +166,12 @@ const TCHAR* CEol::GetName() const
{
return g_aEolTable[ m_eEolType ].m_szName;
}
#ifdef NK_FIX_STATUSBAR
#ifdef NKMM_FIX_STATUSBAR
const TCHAR* CEol::GetName2() const
{
return g_aEolTable2[ m_eEolType ].m_szName;
}
#endif // NK_
#endif // NKMM_

//!< 現在のEOL文字列先頭へのポインタを取得
const wchar_t* CEol::GetValue2() const
Expand Down
4 changes: 2 additions & 2 deletions sakura_core/CEol.h
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,9 @@ class CEol{
EEolType GetType() const{ return m_eEolType; } //!< 現在のTypeを取得
CLogicInt GetLen() const; //!< 現在のEOL長を取得。文字単位。
const TCHAR* GetName() const; //!< 現在のEOLの名称取得
#ifdef NK_FIX_STATUSBAR
#ifdef NKMM_FIX_STATUSBAR
const TCHAR* GetName2() const; //!< 現在のEOLの名称取得
#endif // NK_
#endif // NKMM_
const wchar_t* GetValue2() const; //!< 現在のEOL文字列先頭へのポインタを取得
//#####

Expand Down
4 changes: 2 additions & 2 deletions sakura_core/CGrepAgent.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -224,9 +224,9 @@ DWORD CGrepAgent::DoGrep(
}
pcViewDst->GetDocument()->m_cDocEditor.m_pcOpeBlk->AddRef();

#ifdef NK_FIX_EDITVIEW_SCRBAR
#ifdef NKMM_FIX_EDITVIEW_SCRBAR
pcViewDst->SB_Marker_CallPaint(100);
#endif // NK_
#endif // NKMM_
pcViewDst->m_bCurSrchKeyMark = true; /* 検索文字列のマーク */
pcViewDst->m_strCurSearchKey = pcmGrepKey->GetStringPtr(); /* 検索文字列 */
pcViewDst->m_sCurSearchOption = sSearchOption; // 検索オプション
Expand Down
4 changes: 2 additions & 2 deletions sakura_core/CLoadAgent.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -280,8 +280,8 @@ void CLoadAgent::OnFinalLoad(ELoadResult eLoadResult)
}
CCaret& cCaret = CEditWnd::getInstance()->GetActiveView().GetCaret();
cCaret.MoveCursor(cCaret.GetCaretLayoutPos(),true);
#ifdef NK_FIX_EDITVIEW_SCRBAR
#ifdef NKMM_FIX_EDITVIEW_SCRBAR
CEditWnd::getInstance()->GetActiveView().SB_Marker_Clear(9000);
#endif // NK_
#endif // NKMM_
CEditWnd::getInstance()->GetActiveView().AdjustScrollBars();
}
4 changes: 2 additions & 2 deletions sakura_core/COpeBlk.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
COpeBlk::COpeBlk()
{
m_refCount = 0;
#ifdef NK_FIX_UNDOREDO
#ifdef NKMM_FIX_UNDOREDO
m_ppCOpeArr.reserve(1000);
#endif // NK_
#endif // NKMM_
}

COpeBlk::~COpeBlk()
Expand Down
4 changes: 2 additions & 2 deletions sakura_core/COpeBuf.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ COpeBuf::COpeBuf()
{
m_nCurrentPointer = 0; /* 現在位置 */
m_nNoModifiedIndex = 0; /* 無変更な状態になった位置 */
#ifdef NK_FIX_UNDOREDO
#ifdef NKMM_FIX_UNDOREDO
m_vCOpeBlkArr.reserve(1000);
#endif // NK_
#endif // NKMM_
}

/* COpeBufクラス消滅 */
Expand Down
2 changes: 1 addition & 1 deletion sakura_core/Funccode_x.hsrc
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,7 @@ F_ISEARCH_ADD_STR = 0xC002, // Incremental Search
F_ISEARCH_DEL_BACK = 0xC003, // Incremental Search�̖�������1�����폜


//NK_FIX_SWITCH_DISP_LINENR_MACRO
//NKMM_FIX_SWITCH_DISP_LINENR_MACRO
F_SWITCH_DISP_LINE_NUMBER = 0xD001, // �s�ԍ��\���ؑփ}�N��

//}; //end of enum EFunction
26 changes: 13 additions & 13 deletions sakura_core/_main/CControlTray.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ void CControlTray::DoGrepCreateWindow(HINSTANCE hinst, HWND msgParent, CDlgGrep&
CNativeT cmWork2;
CNativeT cmWork3;
cmWork1.SetString( cDlgGrep.m_strText.c_str() );
#ifdef NK_FIX_GREP
#ifdef NKMM_FIX_GREP
int count = 0;
CNativeT temp;
if (!cDlgGrep.m_bFromThisText) {
Expand All @@ -126,7 +126,7 @@ void CControlTray::DoGrepCreateWindow(HINSTANCE hinst, HWND msgParent, CDlgGrep&
{
std::vector<std::tstring> entrys;
std::vector<std::tstring> values;
EnumRegKeyEntry(NK_REGKEY, entrys, &values);
EnumRegKeyEntry(NKMM_REGKEY, entrys, &values);
int i = 0;
for (auto e : entrys) {
if (e[0] == _T('$')) {
Expand Down Expand Up @@ -175,7 +175,7 @@ void CControlTray::DoGrepCreateWindow(HINSTANCE hinst, HWND msgParent, CDlgGrep&
#else
cmWork2.SetString( cDlgGrep.m_szFile );
cmWork3.SetString( cDlgGrep.m_szFolder );
#endif // NK_
#endif // NKMM_
cmWork1.Replace( L"\"", L"\"\"" );
cmWork2.Replace( _T("\""), _T("\"\"") );
cmWork3.Replace( _T("\""), _T("\"\"") );
Expand All @@ -195,11 +195,11 @@ void CControlTray::DoGrepCreateWindow(HINSTANCE hinst, HWND msgParent, CDlgGrep&

//GOPTオプション
TCHAR pOpt[64] = _T("");
#ifdef NK_FIX_GREP
#ifdef NKMM_FIX_GREP
if( (count > 0) && cDlgGrep.m_bSubFolder )_tcscat( pOpt, _T("S") ); // サブフォルダからも検索する
#else
if( cDlgGrep.m_bSubFolder )_tcscat( pOpt, _T("S") ); // サブフォルダからも検索する
#endif // NK_
#endif // NKMM_
if( cDlgGrep.m_sSearchOption.bLoHiCase )_tcscat( pOpt, _T("L") ); // 英大文字と英小文字を区別する
if( cDlgGrep.m_sSearchOption.bRegularExp )_tcscat( pOpt, _T("R") ); // 正規表現
if( cDlgGrep.m_nGrepOutputLineType == 1 )_tcscat( pOpt, _T("P") ); // 行を出力する
Expand Down Expand Up @@ -779,7 +779,7 @@ LRESULT CControlTray::DispatchEvent(
// "共通"の前には入れない
if( 0 < nInsert && nInsert <= m_pShareData->m_nTypesCount && nInsert < MAX_TYPES ){
std::vector<STypeConfig*>& types = CShareData::getInstance()->GetTypeSettings();
#ifdef NK_FIX_TYPELIST_ADD_ANY_TYPE
#ifdef NKMM_FIX_TYPELIST_ADD_ANY_TYPE
STypeConfig* type;
//si::logln(L" *** add type : LPAARAM %p", lParam);
if (lParam != 0) {
Expand All @@ -800,10 +800,10 @@ LRESULT CControlTray::DispatchEvent(
#else
STypeConfig* type = new STypeConfig();
*type = *types[0]; // 基本をコピー
#endif // NK_
#endif // NKMM_
type->m_nIdx = nInsert;
type->m_id = (::GetTickCount() & 0x3fffffff) + nInsert * 0x10000;
#ifdef NK_FIX_TYPELIST_ADD_ANY_TYPE
#ifdef NKMM_FIX_TYPELIST_ADD_ANY_TYPE
if (lParam == 0) {
// 同じ名前のものがあったらその次にする
int nAddNameNum = nInsert + 1;
Expand All @@ -829,7 +829,7 @@ LRESULT CControlTray::DispatchEvent(
}
}
auto_strcpy( type->m_szTypeExts, _T("") );
#endif // NK_
#endif // NKMM_
type->m_nRegexKeyMagicNumber = CRegexKeyword::GetNewMagicNumber();
types.resize( m_pShareData->m_nTypesCount + 1 );
int nTypeSizeOld = m_pShareData->m_nTypesCount;
Expand Down Expand Up @@ -1239,9 +1239,9 @@ bool CControlTray::OpenNewEditor(
bool bNewWindow //!< [in] 新規エディタを新しいウインドウで開く
)
{
#ifdef NK_FIX_CENTERING_CURSOR_JUMP
#ifdef NKMM_FIX_CENTERING_CURSOR_JUMP
GetDllShareData().m_sFlags.m_nCenteringCursor++;
#endif // NK_
#endif // NKMM_

/* 共有データ構造体のアドレスを返す */
DLLSHAREDATA* pShareData = &GetDllShareData();
Expand Down Expand Up @@ -1462,9 +1462,9 @@ bool CControlTray::OpenNewEditor2(
bool bNewWindow //!< [in] 新規エディタを新しいウインドウで開く
)
{
#ifdef NK_FIX_CENTERING_CURSOR_JUMP
#ifdef NKMM_FIX_CENTERING_CURSOR_JUMP
GetDllShareData().m_sFlags.m_nCenteringCursor++;
#endif // NK_
#endif // NKMM_

DLLSHAREDATA* pShareData;

Expand Down
4 changes: 2 additions & 2 deletions sakura_core/_main/CNormalProcess.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -340,15 +340,15 @@ bool CNormalProcess::InitializeProcess()
// Oct. 19, 2001 genta
// 未設定=-1になるようにしたので,安全のため両者が指定されたときだけ
// 移動するようにする. || → &&
#ifdef NK_FIX_CENTERING_CURSOR_JUMP
#ifdef NKMM_FIX_CENTERING_CURSOR_JUMP
GetDllShareData().m_sFlags.m_nCenteringCursor++;
#else
if( ( CLayoutInt(0) <= fi.m_nViewTopLine && CLayoutInt(0) <= fi.m_nViewLeftCol )
&& fi.m_nViewTopLine < pEditWnd->GetDocument()->m_cLayoutMgr.GetLineCount() ){
pEditWnd->GetActiveView().GetTextArea().SetViewTopLine( fi.m_nViewTopLine );
pEditWnd->GetActiveView().GetTextArea().SetViewLeftCol( fi.m_nViewLeftCol );
}
#endif // NK_
#endif // NKMM_

// オプション指定がないときはカーソル位置設定を行わないようにする
// Oct. 19, 2001 genta
Expand Down
8 changes: 4 additions & 4 deletions sakura_core/apiwrap/CommonControl.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ namespace ApiWrap
// -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- //
// ステータスバー //
// -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- //
#ifdef NK_FIX_STATUSBAR
#ifdef NKMM_FIX_STATUSBAR
inline LRESULT StatusBar_GetText(HWND hwndStatus, WPARAM opt, TCHAR* str)
{
if (0 < ::SendMessage(hwndStatus, SB_GETTEXTLENGTH, opt & 0xFF, (LPARAM)str)) {
Expand All @@ -42,10 +42,10 @@ namespace ApiWrap
return 0L;
}
}
#endif // NK_
#endif // NKMM_
inline LRESULT StatusBar_SetText(HWND hwndStatus, WPARAM opt, const TCHAR* str)
{
#ifdef NK_FIX_STATUSBAR
#ifdef NKMM_FIX_STATUSBAR
if (hwndStatus == NULL) return 0L;
if (str && (opt & SBT_OWNERDRAW) == 0) {
TCHAR temp[256] = {};
Expand All @@ -56,7 +56,7 @@ namespace ApiWrap
if (temp[0] == _T('\0') && str[0] == _T('\0')) return 1L; // 同じ場合は処理しない
}
}
#endif // NK_
#endif // NKMM_
return ::SendMessage( hwndStatus, SB_SETTEXT, opt, (LPARAM)str );
}

Expand Down
40 changes: 20 additions & 20 deletions sakura_core/cmd/CViewCommander_Bookmark.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@ void CViewCommander::Command_JUMP_DIALOG( void )
/* 指定行ヘジャンプ */
void CViewCommander::Command_JUMP( void )
{
#ifdef NK_FIX_CENTERING_CURSOR_JUMP
#ifdef NKMM_FIX_CENTERING_CURSOR_JUMP
GetDllShareData().m_sFlags.m_nCenteringCursor++;
#endif // NK_
#endif // NKMM_
const wchar_t* pLine;
int nMode;
int bValidLine;
Expand Down Expand Up @@ -277,7 +277,7 @@ void CViewCommander::Command_BOOKMARK_SET(void)
pCDocLine=GetDocument()->m_cDocLineMgr.GetLine( nY );
CBookmarkSetter cBookmark(pCDocLine);
if(pCDocLine)cBookmark.SetBookmark(!cBookmark.IsBookmarked());
#ifdef NK_FIX_EDITVIEW_SCRBAR
#ifdef NKMM_FIX_EDITVIEW_SCRBAR
if (pCDocLine) {
// レイアウト行
CLogicInt nLogicY = nY;
Expand All @@ -286,21 +286,21 @@ void CViewCommander::Command_BOOKMARK_SET(void)
GetDocument()->m_cLayoutMgr.LogicToLayout(ptXY, &ptLayout, nLogicY);

if (cBookmark.IsBookmarked()) {
m_pCommanderView->SBMarker_->Add(ptLayout.y, NK_SCRBAR_MARK_MAGIC); // 登録
m_pCommanderView->SBMarker_->Add(ptLayout.y, NKMM_SCRBAR_MARK_MAGIC); // 登録
}
else {
m_pCommanderView->SBMarker_->Del(ptLayout.y, NK_SCRBAR_MARK_MAGIC); // 削除
m_pCommanderView->SBMarker_->Del(ptLayout.y, NKMM_SCRBAR_MARK_MAGIC); // 削除
}
m_pCommanderView->SB_Marker_CallPaint(4001);
}
#endif // NK_
#endif // NKMM_
}
}
else{
pCDocLine=GetDocument()->m_cDocLineMgr.GetLine( GetCaret().GetCaretLogicPos().GetY2() );
CBookmarkSetter cBookmark(pCDocLine);
if(pCDocLine)cBookmark.SetBookmark(!cBookmark.IsBookmarked());
#ifdef NK_FIX_EDITVIEW_SCRBAR
#ifdef NKMM_FIX_EDITVIEW_SCRBAR
if (pCDocLine) {
// レイアウト行
CLogicInt nLogicY = GetCaret().GetCaretLogicPos().GetY2();
Expand All @@ -309,14 +309,14 @@ void CViewCommander::Command_BOOKMARK_SET(void)
GetDocument()->m_cLayoutMgr.LogicToLayout(ptXY, &ptLayout, nLogicY);

if (cBookmark.IsBookmarked()) {
m_pCommanderView->SBMarker_->Add(ptLayout.y, NK_SCRBAR_MARK_MAGIC); // 登録
m_pCommanderView->SBMarker_->Add(ptLayout.y, NKMM_SCRBAR_MARK_MAGIC); // 登録
}
else {
m_pCommanderView->SBMarker_->Del(ptLayout.y, NK_SCRBAR_MARK_MAGIC); // 削除
m_pCommanderView->SBMarker_->Del(ptLayout.y, NKMM_SCRBAR_MARK_MAGIC); // 削除
}
m_pCommanderView->SB_Marker_CallPaint(4002);
}
#endif // NK_
#endif // NKMM_
}

// 2002.01.16 hor 分割したビューも更新
Expand All @@ -329,9 +329,9 @@ void CViewCommander::Command_BOOKMARK_SET(void)
//! 次のブックマークを探し,見つかったら移動する
void CViewCommander::Command_BOOKMARK_NEXT(void)
{
#ifdef NK_FIX_CENTERING_CURSOR_JUMP
#ifdef NKMM_FIX_CENTERING_CURSOR_JUMP
GetDllShareData().m_sFlags.m_nCenteringCursor++;
#endif // NK_
#endif // NKMM_
int nYOld; // hor
BOOL bFound = FALSE; // hor
BOOL bRedo = TRUE; // hor
Expand Down Expand Up @@ -375,9 +375,9 @@ re_do:; // hor
//! 前のブックマークを探し,見つかったら移動する.
void CViewCommander::Command_BOOKMARK_PREV(void)
{
#ifdef NK_FIX_CENTERING_CURSOR_JUMP
#ifdef NKMM_FIX_CENTERING_CURSOR_JUMP
GetDllShareData().m_sFlags.m_nCenteringCursor++;
#endif // NK_
#endif // NKMM_
int nYOld; // hor
BOOL bFound = FALSE; // hor
BOOL bRedo = TRUE; // hor
Expand Down Expand Up @@ -423,9 +423,9 @@ re_do:; // hor
void CViewCommander::Command_BOOKMARK_RESET(void)
{
CBookmarkManager(&GetDocument()->m_cDocLineMgr).ResetAllBookMark();
#ifdef NK_FIX_EDITVIEW_SCRBAR
#ifdef NKMM_FIX_EDITVIEW_SCRBAR
m_pCommanderView->SB_Marker_Clear(203);
#endif // NK_
#endif // NKMM_
// 2002.01.16 hor 分割したビューも更新
GetEditWindow()->Views_Redraw();
}
Expand All @@ -452,9 +452,9 @@ void CViewCommander::Command_BOOKMARK_PATTERN( void )
//! 次の関数リストマークを探し,見つかったら移動する
void CViewCommander::Command_FUNCLIST_NEXT(void)
{
#ifdef NK_FIX_CENTERING_CURSOR_JUMP
#ifdef NKMM_FIX_CENTERING_CURSOR_JUMP
GetDllShareData().m_sFlags.m_nCenteringCursor++;
#endif // NK_
#endif // NKMM_
CLogicPoint ptXY(0, GetCaret().GetCaretLogicPos().y);
int nYOld = ptXY.y;

Expand Down Expand Up @@ -485,9 +485,9 @@ void CViewCommander::Command_FUNCLIST_NEXT(void)
//! 前のブックマークを探し,見つかったら移動する.
void CViewCommander::Command_FUNCLIST_PREV(void)
{
#ifdef NK_FIX_CENTERING_CURSOR_JUMP
#ifdef NKMM_FIX_CENTERING_CURSOR_JUMP
GetDllShareData().m_sFlags.m_nCenteringCursor++;
#endif // NK_
#endif // NKMM_

CLogicPoint ptXY(0,GetCaret().GetCaretLogicPos().y);
int nYOld = ptXY.y;
Expand Down
Loading

0 comments on commit 6348ca6

Please sign in to comment.