From 6c95f0141b3083b0fe33d0aba5d7e19f1d77cdf3 Mon Sep 17 00:00:00 2001 From: lotem Date: Thu, 24 Nov 2011 10:15:51 +0000 Subject: [PATCH] Disable logging in weasel frontend. git-svn-id: https://rimeime.googlecode.com/svn/trunk/weasel@362 b90aed45-4297-9963-ff9d-98b604ac09a9 --- {RimingWeasel => RimeWithWeasel}/ReadMe.txt | 10 +++--- .../RimeWithWeasel.cpp | 34 +++++++++++-------- .../RimeWithWeasel.vcproj | 8 ++--- {RimingWeasel => RimeWithWeasel}/stdafx.cpp | 2 +- {RimingWeasel => RimeWithWeasel}/stdafx.h | 0 {RimingWeasel => RimeWithWeasel}/targetver.h | 0 WeaselIME/WeaselIME.cpp | 15 +++++--- WeaselServer/WeaselServer.cpp | 4 +-- include/{RimingWeasel.h => RimeWithWeasel.h} | 6 ++-- weasel.sln | 4 +-- 10 files changed, 47 insertions(+), 36 deletions(-) rename {RimingWeasel => RimeWithWeasel}/ReadMe.txt (76%) rename RimingWeasel/RimingWeasel.cpp => RimeWithWeasel/RimeWithWeasel.cpp (82%) rename RimingWeasel/RimingWeasel.vcproj => RimeWithWeasel/RimeWithWeasel.vcproj (94%) rename {RimingWeasel => RimeWithWeasel}/stdafx.cpp (79%) rename {RimingWeasel => RimeWithWeasel}/stdafx.h (100%) rename {RimingWeasel => RimeWithWeasel}/targetver.h (100%) rename include/{RimingWeasel.h => RimeWithWeasel.h} (84%) diff --git a/RimingWeasel/ReadMe.txt b/RimeWithWeasel/ReadMe.txt similarity index 76% rename from RimingWeasel/ReadMe.txt rename to RimeWithWeasel/ReadMe.txt index 3d39ce23d..889109be8 100644 --- a/RimingWeasel/ReadMe.txt +++ b/RimeWithWeasel/ReadMe.txt @@ -1,14 +1,14 @@ ======================================================================== - STATIC LIBRARY : RimingWeasel Project Overview + STATIC LIBRARY : RimeWithWeasel Project Overview ======================================================================== -AppWizard has created this RimingWeasel library project for you. +AppWizard has created this RimeWithWeasel library project for you. This file contains a summary of what you will find in each of the files that -make up your RimingWeasel application. +make up your RimeWithWeasel application. -RimingWeasel.vcproj +RimeWithWeasel.vcproj This is the main project file for VC++ projects generated using an Application Wizard. It contains information about the version of Visual C++ that generated the file, and information about the platforms, configurations, and project features selected with the @@ -19,7 +19,7 @@ RimingWeasel.vcproj StdAfx.h, StdAfx.cpp These files are used to build a precompiled header (PCH) file - named RimingWeasel.pch and a precompiled types file named StdAfx.obj. + named RimeWithWeasel.pch and a precompiled types file named StdAfx.obj. ///////////////////////////////////////////////////////////////////////////// Other notes: diff --git a/RimingWeasel/RimingWeasel.cpp b/RimeWithWeasel/RimeWithWeasel.cpp similarity index 82% rename from RimingWeasel/RimingWeasel.cpp rename to RimeWithWeasel/RimeWithWeasel.cpp index 29fce3dc6..4281f102d 100644 --- a/RimingWeasel/RimingWeasel.cpp +++ b/RimeWithWeasel/RimeWithWeasel.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include +#include #include #include #include @@ -21,12 +21,18 @@ static const std::string WeaselLogFilePath() #define EZLOGGER_OUTPUT_FILENAME WeaselLogFilePath() #define EZLOGGER_REPLACE_EXISTING_LOGFILE_ + +// logging enabled +//#define EZDBGONLYLOGGERPRINT(...) +//#define EZDBGONLYLOGGERFUNCTRACKER + #pragma warning(disable: 4995) #pragma warning(disable: 4996) #include #pragma warning(default: 4996) #pragma warning(default: 4995) + const WCHAR* utf8towcs(const char* utf8_str) { const int buffer_len = 4096; @@ -61,16 +67,16 @@ static const char* weasel_user_data_dir() { return path; } -RimingWeaselHandler::RimingWeaselHandler() +RimeWithWeaselHandler::RimeWithWeaselHandler() : active_session(0) { } -RimingWeaselHandler::~RimingWeaselHandler() +RimeWithWeaselHandler::~RimeWithWeaselHandler() { } -void RimingWeaselHandler::Initialize() +void RimeWithWeaselHandler::Initialize() { EZDBGONLYLOGGERPRINT("Initializing la rime."); RimeTraits weasel_traits; @@ -80,21 +86,21 @@ void RimingWeaselHandler::Initialize() m_ui.Create(NULL); } -void RimingWeaselHandler::Finalize() +void RimeWithWeaselHandler::Finalize() { EZDBGONLYLOGGERPRINT("Finalizing la rime."); m_ui.Destroy(); RimeFinalize(); } -UINT RimingWeaselHandler::FindSession(UINT session_id) +UINT RimeWithWeaselHandler::FindSession(UINT session_id) { bool found = RimeFindSession(session_id); EZDBGONLYLOGGERPRINT("Find session: session_id = 0x%x, found = %d", session_id, found); return found ? session_id : 0; } -UINT RimingWeaselHandler::AddSession(LPWSTR buffer) +UINT RimeWithWeaselHandler::AddSession(LPWSTR buffer) { UINT session_id = RimeCreateSession(); EZDBGONLYLOGGERPRINT("Add session: created session_id = 0x%x", session_id); @@ -104,7 +110,7 @@ UINT RimingWeaselHandler::AddSession(LPWSTR buffer) return session_id; } -UINT RimingWeaselHandler::RemoveSession(UINT session_id) +UINT RimeWithWeaselHandler::RemoveSession(UINT session_id) { EZDBGONLYLOGGERPRINT("Remove session: session_id = 0x%x", session_id); // TODO: force committing? otherwise current composition would be lost @@ -114,7 +120,7 @@ UINT RimingWeaselHandler::RemoveSession(UINT session_id) return 0; } -BOOL RimingWeaselHandler::ProcessKeyEvent(weasel::KeyEvent keyEvent, UINT session_id, LPWSTR buffer) +BOOL RimeWithWeaselHandler::ProcessKeyEvent(weasel::KeyEvent keyEvent, UINT session_id, LPWSTR buffer) { EZDBGONLYLOGGERPRINT("Process key event: keycode = 0x%x, mask = 0x%x, session_id = 0x%x", keyEvent.keycode, keyEvent.mask, session_id); @@ -125,21 +131,21 @@ BOOL RimingWeaselHandler::ProcessKeyEvent(weasel::KeyEvent keyEvent, UINT sessio return (BOOL)taken; } -void RimingWeaselHandler::FocusIn(UINT session_id) +void RimeWithWeaselHandler::FocusIn(UINT session_id) { EZDBGONLYLOGGERPRINT("Focus in: session_id = 0x%x", session_id); _UpdateUI(session_id); active_session = session_id; } -void RimingWeaselHandler::FocusOut(UINT session_id) +void RimeWithWeaselHandler::FocusOut(UINT session_id) { EZDBGONLYLOGGERPRINT("Focus out: session_id = 0x%x", session_id); m_ui.Hide(); active_session = 0; } -void RimingWeaselHandler::UpdateInputPosition(RECT const& rc, UINT session_id) +void RimeWithWeaselHandler::UpdateInputPosition(RECT const& rc, UINT session_id) { EZDBGONLYLOGGERPRINT("Update input position: (%d, %d), session_id = 0x%x, active_session = 0x%x", rc.left, rc.top, session_id, active_session); @@ -151,7 +157,7 @@ void RimingWeaselHandler::UpdateInputPosition(RECT const& rc, UINT session_id) } } -void RimingWeaselHandler::_UpdateUI(UINT session_id) +void RimeWithWeaselHandler::_UpdateUI(UINT session_id) { weasel::Context weasel_context; RimeContext ctx; @@ -201,7 +207,7 @@ void RimingWeaselHandler::_UpdateUI(UINT session_id) } } -bool RimingWeaselHandler::_Respond(UINT session_id, LPWSTR buffer) +bool RimeWithWeaselHandler::_Respond(UINT session_id, LPWSTR buffer) { std::set actions; std::list messages; diff --git a/RimingWeasel/RimingWeasel.vcproj b/RimeWithWeasel/RimeWithWeasel.vcproj similarity index 94% rename from RimingWeasel/RimingWeasel.vcproj rename to RimeWithWeasel/RimeWithWeasel.vcproj index 225776fa5..79a06c384 100644 --- a/RimingWeasel/RimingWeasel.vcproj +++ b/RimeWithWeasel/RimeWithWeasel.vcproj @@ -2,9 +2,9 @@ @@ -414,7 +414,7 @@ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > -#pragma warning(default: 4996) -#pragma warning(default: 4995) + +// logging disabled +#define EZDBGONLYLOGGERPRINT(...) +#define EZDBGONLYLOGGERFUNCTRACKER + +//#pragma warning(disable: 4995) +//#pragma warning(disable: 4996) +//#include +//#pragma warning(default: 4996) +//#pragma warning(default: 4995) HINSTANCE WeaselIME::s_hModule = 0; diff --git a/WeaselServer/WeaselServer.cpp b/WeaselServer/WeaselServer.cpp index 5d2d877ac..2ea54158e 100644 --- a/WeaselServer/WeaselServer.cpp +++ b/WeaselServer/WeaselServer.cpp @@ -4,7 +4,7 @@ #include "stdafx.h" #include -#include +#include #include CAppModule _Module; @@ -47,7 +47,7 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE /*hPrevInstance*/, LPTSTR lp int nRet = 0; try { - weasel::Server server(new RimingWeaselHandler); + weasel::Server server(new RimeWithWeaselHandler); if (!server.Start()) return -1; nRet = server.Run(); diff --git a/include/RimingWeasel.h b/include/RimeWithWeasel.h similarity index 84% rename from include/RimingWeasel.h rename to include/RimeWithWeasel.h index 35d63143d..d6751242f 100644 --- a/include/RimingWeasel.h +++ b/include/RimeWithWeasel.h @@ -2,12 +2,12 @@ #include #include -class RimingWeaselHandler : +class RimeWithWeaselHandler : public weasel::RequestHandler { public: - RimingWeaselHandler(); - virtual ~RimingWeaselHandler(); + RimeWithWeaselHandler(); + virtual ~RimeWithWeaselHandler(); virtual void Initialize(); virtual void Finalize(); virtual UINT FindSession(UINT session_id); diff --git a/weasel.sln b/weasel.sln index 10df46ff8..815ecb985 100644 --- a/weasel.sln +++ b/weasel.sln @@ -15,7 +15,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution ProjectSection(SolutionItems) = preProject include\PyWeasel.h = include\PyWeasel.h include\ResponseParser.h = include\ResponseParser.h - include\RimingWeasel.h = include\RimingWeasel.h + include\RimeWithWeasel.h = include\RimeWithWeasel.h include\WeaselCommon.h = include\WeaselCommon.h include\WeaselIPC.h = include\WeaselIPC.h include\WeaselUI.h = include\WeaselUI.h @@ -58,7 +58,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestResponseParser", "test\ {CE11A2DF-8D20-4B07-A935-4B0D03F0303D} = {CE11A2DF-8D20-4B07-A935-4B0D03F0303D} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RimingWeasel", "RimingWeasel\RimingWeasel.vcproj", "{1C497821-BD63-4F02-9094-32B185B62F23}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RimeWithWeasel", "RimeWithWeasel\RimeWithWeasel.vcproj", "{1C497821-BD63-4F02-9094-32B185B62F23}" ProjectSection(ProjectDependencies) = postProject {10B3B8BF-7294-4661-9A8A-2FFC920FA2F4} = {10B3B8BF-7294-4661-9A8A-2FFC920FA2F4} EndProjectSection