X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Faxwin4_src%2FServer%2Fcompositor.cpp;h=cf8192ec2b6beac1440071976cad3c9db7962d96;hb=6fbf6b93bec9b8b5bd6d7c683eefb0ebed8dff77;hp=7a18747aa14af6f931209a078fedc8926e19eb2d;hpb=cb37616a62753de8a1b8d28e3c4ec3ad9891de1b;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/axwin4_src/Server/compositor.cpp b/Usermode/Applications/axwin4_src/Server/compositor.cpp
index 7a18747a..cf8192ec 100644
--- a/Usermode/Applications/axwin4_src/Server/compositor.cpp
+++ b/Usermode/Applications/axwin4_src/Server/compositor.cpp
@@ -7,21 +7,21 @@
  */
 #include <video.hpp>
 #include <CCompositor.hpp>
+#include <CClient.hpp>
+#include <ipc.hpp>
 #include <cassert>
 
 namespace AxWin {
 
 CCompositor::CCompositor(CVideo& video):
-	m_video(video)
+	// TODO: Support multiple screens
+	m_video(video),
+	m_focussed_window(nullptr),
+	m_windowIDBuffer(video.width(), video.height())
 {
 	// 
 }
 
-CWindow* CCompositor::CreateWindow(CClient& client, const ::std::string& name)
-{
-	return new CWindow(*this, client, name);
-}
-
 void CCompositor::ShowWindow(CWindow* window)
 {
 	DamageArea(window->m_surface.m_rect);
@@ -55,7 +55,7 @@ void CCompositor::Redraw()
 {
 	// Redraw the screen and clear damage rects
 	if( m_damageRects.empty() ) {
-		_SysDebug("- No damaged regions");
+		//_SysDebug("- No damaged regions");
 		return ;
 	}
 	
@@ -75,6 +75,7 @@ void CCompositor::Redraw()
 				_SysDebug("Reblit (%i,%i) %ix%i", rel_rect.m_x, rel_rect.m_y, rel_rect.m_w, rel_rect.m_h);
 				BlitFromSurface( window->m_surface, rel_rect );
 				//window->Repaint( rel_rect );
+				m_windowIDBuffer.set(rel_rect.m_x, rel_rect.m_y, rel_rect.m_w, rel_rect.m_h, window);
 			}
 		}
 		
@@ -107,20 +108,77 @@ 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);
-	// TODO: Pass event on to window
+	CWindow	*dstwin = getWindowForCoord(X, Y);
+	if( dstwin )
+	{
+		// Pass event on to window
+		dstwin->MouseMove(X, Y);
+	}
 }
 
 void CCompositor::MouseButton(unsigned int Cursor, unsigned int X, unsigned int Y, eMouseButton Button, bool Press)
 {
 	_SysDebug("MouseButton(%i, %i,%i, %i=%i)", Cursor, X, Y, Button, Press);
-	// TODO: Pass event on to window
+	CWindow	*dstwin = getWindowForCoord(X, Y);
+	_SysDebug("- dstwin = %p", dstwin);
+	if( dstwin )
+	{
+		// 1. Give focus and bring to front
+		// 2. Send event
+		dstwin->MouseButton(Button, X, Y, Press);
+	}
 }
 
 void CCompositor::KeyState(unsigned int KeyboardID, uint32_t KeySym, bool Press, uint32_t Codepoint)
 {
 	_SysDebug("KeyState(%i, 0x%x, %b, 0x%x)", KeyboardID, KeySym, Press, Codepoint);
+	if( m_focussed_window )
+	{
+		m_focussed_window->KeyEvent(KeySym, "", Press);
+	}
+}
+
+CWindow* CCompositor::getWindowForCoord(unsigned int X, unsigned int Y)
+{
+	return m_windowIDBuffer.get(X, Y);
+}
+
+// --------------------------------------------------------------------
+CWindowIDBuffer::CWindowIDBuffer(unsigned int W, unsigned int H):
+	m_w(W),
+	m_buf(W*H)
+{
+}
+void CWindowIDBuffer::set(unsigned int X, unsigned int Y, unsigned int W, unsigned int H, CWindow* win)
+{
+	TWindowID	ent = {
+		.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)
+{
+	if( X >= m_w )
+		return nullptr;
+	unsigned int pos = Y*m_w + X;
+	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 ) {
+		//_SysDebug("CWindowIDBuffer::get client=%p", client);
+		return nullptr;
+	}
+	return client->GetWindow(id.Window);
 }
 
 }	// namespace AxWin