X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Faxwin4_src%2FServer%2Fcompositor.cpp;h=da924e8db9d899e58b442dbc8254f485e78bc7b1;hb=b5f8fa2dea9d6a67ac5c8a3a442ee4570deaa56c;hp=42bb8b9b1d963564e6debc992a93ba49342fe6c4;hpb=8b16265b4394af76f64c30393e27d08c294c4bac;p=tpg%2Facess2.git diff --git a/Usermode/Applications/axwin4_src/Server/compositor.cpp b/Usermode/Applications/axwin4_src/Server/compositor.cpp index 42bb8b9b..da924e8d 100644 --- a/Usermode/Applications/axwin4_src/Server/compositor.cpp +++ b/Usermode/Applications/axwin4_src/Server/compositor.cpp @@ -107,7 +107,7 @@ void CCompositor::BlitFromSurface(const CSurface& dest, const CRect& src_rect) void CCompositor::MouseMove(unsigned int Cursor, unsigned int X, unsigned int Y, int dX, int dY) { - _SysDebug("MouseButton(%i, %i,%i, %+i,%+i)", Cursor, X, Y, dX, dY); + //_SysDebug("MouseButton(%i, %i,%i, %+i,%+i)", Cursor, X, Y, dX, dY); m_video.SetCursorPos(X+dX, Y+dY); CWindow *dstwin = getWindowForCoord(X, Y); if( dstwin ) @@ -120,6 +120,7 @@ void CCompositor::MouseButton(unsigned int Cursor, unsigned int X, unsigned int { _SysDebug("MouseButton(%i, %i,%i, %i=%i)", Cursor, X, Y, Button, Press); CWindow *dstwin = getWindowForCoord(X, Y); + _SysDebug("- dstwin = %p", dstwin); if( dstwin ) { // 1. Give focus and bring to front @@ -150,7 +151,12 @@ void CWindowIDBuffer::set(unsigned int X, unsigned int Y, unsigned int W, unsign .Client = win->client().id(), .Window = win->id(), }; - + for( unsigned int row = 0; row < H; row ++ ) + { + TWindowID* dst = &m_buf[ (Y+row) * m_w ]; + for( unsigned int col = 0; col < W; col ++ ) + dst[col] = ent; + } } CWindow* CWindowIDBuffer::get(unsigned int X, unsigned int Y) { @@ -160,9 +166,12 @@ CWindow* CWindowIDBuffer::get(unsigned int X, unsigned int Y) if( pos >= m_buf.size() ) return nullptr; auto id = m_buf[pos]; + //_SysDebug("CWindowIDBuffer::get id = {%i,%i}", id.Client, id.Window); auto client = ::AxWin::IPC::GetClientByID(id.Client); - if( client == nullptr ) + if( client == nullptr ) { + //_SysDebug("CWindowIDBuffer::get client=%p", client); return nullptr; + } return client->GetWindow(id.Window); }