From 32637a3bcd6e38425272f901745a76efa301afd5 Mon Sep 17 00:00:00 2001 From: "John Hodge (sonata)" Date: Fri, 7 Nov 2014 11:41:59 +0800 Subject: [PATCH] Usermode/AxWin4 - Clean up logging --- .../axwin4_src/Server/CIPCChannel_AcessIPCPipe.cpp | 4 ++-- Usermode/Applications/axwin4_src/Server/draw_control.cpp | 2 +- Usermode/Applications/axwin4_src/Server/ipc.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Usermode/Applications/axwin4_src/Server/CIPCChannel_AcessIPCPipe.cpp b/Usermode/Applications/axwin4_src/Server/CIPCChannel_AcessIPCPipe.cpp index 51d88b17..0d894e3d 100644 --- a/Usermode/Applications/axwin4_src/Server/CIPCChannel_AcessIPCPipe.cpp +++ b/Usermode/Applications/axwin4_src/Server/CIPCChannel_AcessIPCPipe.cpp @@ -108,8 +108,8 @@ void CClient_AcessIPCPipe::HandleReceive() size_t len = _SysRead(m_fd, rxbuf.data(), rxbuf.capacity()); if( len == (size_t)-1 ) throw ::std::system_error(errno, ::std::system_category()); - //_SysDebug("CClient_AcessIPCPipe::HandleReceive - Rx %i/%i bytes", len, rxbuf.capacity()); - _SysDebugHex("CClient_AcessIPCPipe::HandleReceive", rxbuf.data(), len); + _SysDebug("CClient_AcessIPCPipe::HandleReceive - Rx %i/%i bytes", len, rxbuf.capacity()); + //_SysDebugHex("CClient_AcessIPCPipe::HandleReceive", rxbuf.data(), len); rxbuf.resize(len); CDeserialiser msg( ::std::move(rxbuf) ); diff --git a/Usermode/Applications/axwin4_src/Server/draw_control.cpp b/Usermode/Applications/axwin4_src/Server/draw_control.cpp index c3e54e1e..ef105e77 100644 --- a/Usermode/Applications/axwin4_src/Server/draw_control.cpp +++ b/Usermode/Applications/axwin4_src/Server/draw_control.cpp @@ -82,7 +82,7 @@ void CControl::Render(CSurface& dest, const CRect& rect) const void CControl::renderLine(CSurface& dest, int y, ::std::vector& scanline, const CRect& rect, const uint32_t* ctrl_line) const { - _SysDebug("renderLine: (y=%i,rect={(%i,%i) %ix%i}", y, rect.m_x, rect.m_y, rect.m_w, rect.m_h); + //_SysDebug("renderLine: (y=%i,rect={(%i,%i) %ix%i}", y, rect.m_x, rect.m_y, rect.m_w, rect.m_h); const int left_fill_end = rect.m_w / 2 - m_inner_x; const int right_fill_end = rect.m_w - m_edge_x; diff --git a/Usermode/Applications/axwin4_src/Server/ipc.cpp b/Usermode/Applications/axwin4_src/Server/ipc.cpp index d042da9f..d41d2ce4 100644 --- a/Usermode/Applications/axwin4_src/Server/ipc.cpp +++ b/Usermode/Applications/axwin4_src/Server/ipc.cpp @@ -185,7 +185,7 @@ void HandleMessage_SetWindowAttr(CClient& client, CDeserialiser& message) { uint16_t win_id = message.ReadU16(); uint16_t attr_id = message.ReadU16(); - _SysDebug("_SetWindowAttr: (%i, %i)", win_id, attr_id); + _SysDebug("_SetWindowAttr: (Win=%i, ID=%i)", win_id, attr_id); CWindow* win = client.GetWindow(win_id); if(!win) { @@ -307,7 +307,7 @@ void HandleMessage_DrawCtl(CClient& client, CDeserialiser& message) uint16_t h = message.ReadU16(); uint16_t ctrl_id = message.ReadU16(); uint16_t frame = message.ReadU16(); - _SysDebug("_DrawCtl: (%i, (%i,%i) %ix%i %i %06x)", win_id, x, y, w, h, ctrl_id, frame); + _SysDebug("_DrawCtl: (%i, (%i,%i) %ix%i Ctl%i frame?=0x%04x)", win_id, x, y, w, h, ctrl_id, frame); CWindow* win = client.GetWindow(win_id); if(!win) { -- 2.20.1