diff --git a/Source/Core/Common/Src/ConsoleListener.cpp b/Source/Core/Common/Src/ConsoleListener.cpp index 1fff3bee2e..7419c86b40 100644 --- a/Source/Core/Common/Src/ConsoleListener.cpp +++ b/Source/Core/Common/Src/ConsoleListener.cpp @@ -16,9 +16,6 @@ // http://code.google.com/p/dolphin-emu/ -//////////////////////////////////////////////////////////////////////////////////////////////////////// -// Include -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ #include // min #include // System: To be able to add strings with "+" #include @@ -31,12 +28,7 @@ #include "Common.h" #include "LogManager.h" // Common -//////////////////////////////////////////////////////////////////////////////////////////////////////// - -//////////////////////////////////////////////////////////////////////////////////////////////////////// -// Main -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ ConsoleListener::ConsoleListener() { #ifdef _WIN32 @@ -87,16 +79,10 @@ bool ConsoleListener::IsOpen() return true; #endif } -//////////////////////////////////////////////////////////////////////////////////////////////////////// - -//////////////////////////////////////////////////////////////////////////////////////////////////////// -// Size -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ /* -Short documentation: - LetterSpace: SetConsoleScreenBufferSize and SetConsoleWindowInfo are dependent on each other, that's the - reason for the additional checks. + LetterSpace: SetConsoleScreenBufferSize and SetConsoleWindowInfo are + dependent on each other, that's the reason for the additional checks. */ void ConsoleListener::BufferWidthHeight(int BufferWidth, int BufferHeight, int ScreenWidth, int ScreenHeight, bool BufferFirst) { @@ -211,12 +197,6 @@ void ConsoleListener::PixelSpace(int Left, int Top, int Width, int Height, bool coordScreen = GetCoordinates(BytesRead, ConInfo.dwSize.X); LastAttrRead = cAttrRead; } - // --------------------------------------------------------------------- - - - // --------------------------------------------------------------------- - // Modify the buffer proportions - // ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ // Letter space int LWidth = floor((float)Width / 8.0) - 1.0; int LHeight = floor((float)Height / 12.0) - 1.0; @@ -224,12 +204,8 @@ void ConsoleListener::PixelSpace(int Left, int Top, int Width, int Height, bool int LBufHeight = floor((float)BufferSize / (float)LBufWidth); // Change screen buffer size LetterSpace(LBufWidth, LBufHeight); - // --------------------------------------------------------------------- - // --------------------------------------------------------------------- - // Redraw the text - // ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ ClearScreen(true); coordScreen.Y = 0; coordScreen.X = 0; @@ -247,16 +223,10 @@ void ConsoleListener::PixelSpace(int Left, int Top, int Width, int Height, bool BytesWritten += cAttrWritten; coordScreen = GetCoordinates(BytesWritten, LBufWidth); } - // --------------------------------------------------------------------- - - // --------------------------------------------------------------------- - // Update cursor - // ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ int OldCursor = ConInfo.dwCursorPosition.Y * ConInfo.dwSize.X + ConInfo.dwCursorPosition.X; COORD Coo = GetCoordinates(OldCursor, LBufWidth); SetConsoleCursorPosition(hConsole, Coo); - // --------------------------------------------------------------------- if (SLog.length() > 0) Log(LogTypes::LNOTICE, SLog.c_str()); @@ -264,13 +234,7 @@ void ConsoleListener::PixelSpace(int Left, int Top, int Width, int Height, bool if (Resize) MoveWindow(GetConsoleWindow(), Left,Top, (Width + 100),Height, true); #endif } -//////////////////////////////////////////////////////////////////////////////////////////////////////// - -//////////////////////////////////////////////////////////////////////////////////////////////////////// -// Write -// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ -//void ConsoleListener::Log(LogTypes::LOG_LEVELS Level, const char *Text, ...) void ConsoleListener::Log(LogTypes::LOG_LEVELS Level, const char *Text) { #if defined(_WIN32) @@ -307,7 +271,7 @@ void ConsoleListener::Log(LogTypes::LOG_LEVELS Level, const char *Text) Color = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE; break; } - if (Level != CUSTOM_LEVEL && strlen(Text) > 10) + if (strlen(Text) > 10) { // First 10 chars white SetConsoleTextAttribute(hConsole, FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE | FOREGROUND_INTENSITY); @@ -320,7 +284,6 @@ void ConsoleListener::Log(LogTypes::LOG_LEVELS Level, const char *Text) fprintf(stderr, "%s", Text); #endif } - // Clear console screen void ConsoleListener::ClearScreen(bool Cursor) { @@ -342,5 +305,5 @@ void ConsoleListener::ClearScreen(bool Cursor) if (Cursor) SetConsoleCursorPosition(hConsole, coordScreen); #endif } -//////////////////////////////////////////////////////////////////////////////////////////////////////// + diff --git a/Source/Core/Common/Src/Log.h b/Source/Core/Common/Src/Log.h index bb58bc06fb..a24f7e65f0 100644 --- a/Source/Core/Common/Src/Log.h +++ b/Source/Core/Common/Src/Log.h @@ -23,7 +23,6 @@ #define WARNING_LEVEL 3 // Something is suspicious. #define INFO_LEVEL 4 // General information. #define DEBUG_LEVEL 5 // Detailed debugging - might make things slow. -#define CUSTOM_LEVEL 6 // Custom log namespace LogTypes { @@ -82,7 +81,6 @@ enum LOG_LEVELS { LWARNING = WARNING_LEVEL, LINFO = INFO_LEVEL, LDEBUG = DEBUG_LEVEL, - LCUSTOM = CUSTOM_LEVEL, }; } // namespace diff --git a/Source/Core/Common/Src/LogManager.cpp b/Source/Core/Common/Src/LogManager.cpp index d51f4d18ac..30157cb4fe 100644 --- a/Source/Core/Common/Src/LogManager.cpp +++ b/Source/Core/Common/Src/LogManager.cpp @@ -28,8 +28,7 @@ void GenericLog(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type, const char* LogManager *LogManager::m_logManager = NULL; -LogManager::LogManager()\ - : logMutex(1) { +LogManager::LogManager() : logMutex(1) { // create log files m_Log[LogTypes::MASTER_LOG] = new LogContainer("*", "Master Log"); m_Log[LogTypes::BOOT] = new LogContainer("BOOT", "Boot"); diff --git a/Source/Core/Common/Src/LogManager.h b/Source/Core/Common/Src/LogManager.h index d461390922..6a4c9ca46d 100644 --- a/Source/Core/Common/Src/LogManager.h +++ b/Source/Core/Common/Src/LogManager.h @@ -84,7 +84,6 @@ public: COORD GetCoordinates(int BytesRead, int BufferWidth); #endif void Log(LogTypes::LOG_LEVELS, const char *Text); - //void Log(LogTypes::LOG_LEVELS, const char *Text, ...); void ClearScreen(bool Cursor = true); const char *getName() const { return "Console"; } diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp index de237c2cc9..0cdfafb87e 100644 --- a/Source/Core/DolphinWX/Src/Frame.cpp +++ b/Source/Core/DolphinWX/Src/Frame.cpp @@ -509,14 +509,12 @@ CFrame::CFrame(bool showLogWindow, wxAuiManagerEventHandler(CFrame::OnManagerResize), (wxObject*)0, this); - #ifdef _WIN32 // The functions are only tested in Windows so far wxTheApp->Connect(wxID_ANY, wxEVT_LEFT_DOWN, wxMouseEventHandler(CFrame::OnDoubleClick), (wxObject*)0, this); wxTheApp->Connect(wxID_ANY, wxEVT_MOTION, wxMouseEventHandler(CFrame::OnMotion), (wxObject*)0, this); - #endif // ---------- // Update controls @@ -655,20 +653,21 @@ void CFrame::SetPaneSize() // Debugging, show loose windows void CFrame::ListChildren() { + return; ConsoleListener* Console = LogManager::GetInstance()->getConsoleListener(); for (int i = 0; i < this->GetChildren().size(); i++) { wxWindow * Win = this->GetChildren().Item(i)->GetData(); - Console->Log(LogTypes::LCUSTOM, StringFromFormat( - "%i: %s (%s) :: % s\n", i, - Win->GetName().mb_str(), Win->GetLabel().mb_str(), Win->GetParent()->GetName().mb_str()).c_str()); + // Console->Log(LogTypes::LDEBUG, StringFromFormat( + // "%i: %s (%s) :: % s\n", i, + // Win->GetName().mb_str(), Win->GetLabel().mb_str(), Win->GetParent()->GetName().mb_str()).c_str()); Win = this->GetChildren().Item(i)->GetData(); for (int j = 0; j < Win->GetChildren().size(); j++) { - Console->Log(LogTypes::LCUSTOM, StringFromFormat( - " %i.%i: %s (%s) :: % s\n", i, j, - Win->GetName().mb_str(), Win->GetLabel().mb_str(), Win->GetParent()->GetName().mb_str()).c_str()); + // Console->Log(LogTypes::LDEBUG, StringFromFormat( + // " %i.%i: %s (%s) :: % s\n", i, j, + // Win->GetName().mb_str(), Win->GetLabel().mb_str(), Win->GetParent()->GetName().mb_str()).c_str()); } } } @@ -1127,4 +1126,4 @@ void CFrame::Update() } } #endif -///////////////////////////////////////////////////////////////////////////////////////////////////////// \ No newline at end of file +///////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index 65bda2d0d5..0c32fb18e5 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -172,10 +172,8 @@ void CFrame::CreateMenu() pOptionsMenu->Append(IDM_CONFIG_DSP_PLUGIN, _T("&DSP Settings")); pOptionsMenu->Append(IDM_CONFIG_PAD_PLUGIN, _T("&Pad Settings")); pOptionsMenu->Append(IDM_CONFIG_WIIMOTE_PLUGIN, _T("&Wiimote Settings")); - #ifdef _WIN32 - pOptionsMenu->AppendSeparator(); - pOptionsMenu->Append(IDM_TOGGLE_FULLSCREEN, _T("&Fullscreen\tAlt+Enter")); - #endif + pOptionsMenu->AppendSeparator(); + pOptionsMenu->Append(IDM_TOGGLE_FULLSCREEN, _T("&Fullscreen\tAlt+Enter")); menuBar->Append(pOptionsMenu, _T("&Options")); // Tools menu @@ -218,10 +216,8 @@ void CFrame::CreateMenu() viewMenu->Check(IDM_LISTPAL, SConfig::GetInstance().m_ListPal); viewMenu->AppendCheckItem(IDM_LISTUSA, _T("Show USA")); viewMenu->Check(IDM_LISTUSA, SConfig::GetInstance().m_ListUsa); -#ifdef _WIN32 //TODO test drive loading on linux, I cannot load from drive on my linux system Dolphin just crashes viewMenu->AppendCheckItem(IDM_LISTDRIVES, _T("Show Drives")); viewMenu->Check(IDM_LISTDRIVES, SConfig::GetInstance().m_ListDrives); -#endif viewMenu->AppendSeparator(); viewMenu->Append(IDM_PURGECACHE, _T("Purge Cache")); menuBar->Append(viewMenu, _T("&View")); @@ -259,9 +255,7 @@ void CFrame::PopulateToolbar(wxAuiToolBar* ToolBar) ToolBar->AddSeparator(); ToolBar->AddTool(IDM_PLAY, wxT(""), m_Bitmaps[Toolbar_Play], _T("Play")); ToolBar->AddTool(IDM_STOP, _T("Stop"), m_Bitmaps[Toolbar_Stop], _T("Stop")); -#ifdef _WIN32 ToolBar->AddTool(IDM_TOGGLE_FULLSCREEN, _T("Fullscr."), m_Bitmaps[Toolbar_FullScreen], _T("Toggle Fullscreen")); -#endif ToolBar->AddTool(IDM_SCREENSHOT, _T("Scr.Shot"), m_Bitmaps[Toolbar_FullScreen], _T("Take Screenshot")); ToolBar->AddSeparator(); ToolBar->AddTool(IDM_CONFIG_MAIN, _T("Config"), m_Bitmaps[Toolbar_PluginOptions], _T("Configure...")); @@ -1342,12 +1336,13 @@ void CFrame::ToggleConsole(bool Show, int i) //wxWindow *Win = GetWxWindowHwnd(GetConsoleWindow()); //DoRemovePage (Win, true); DoRemovePageString(wxT("Console"), true); + if(GetConsoleWindow()) ShowWindow(GetConsoleWindow(),SW_HIDE); + #else Console->Close(); #endif - #ifdef _WIN32 - if(GetConsoleWindow()) ShowWindow(GetConsoleWindow(),SW_HIDE); - #endif + + } // Hide pane @@ -1511,4 +1506,4 @@ void CFrame::GameListChanged(wxCommandEvent& event) m_GameListCtrl->Update(); } } -///////////////////////////////////////////////////////////////////////////////////////////////////////// \ No newline at end of file +/////////////////////////////////////////////////////////////////////////////////////////////////////////