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

diff --git a/Usermode/Applications/axwin4_src/Server/compositor.cpp b/Usermode/Applications/axwin4_src/Server/compositor.cpp
index 6f512c8d..7a18747a 100644
--- a/Usermode/Applications/axwin4_src/Server/compositor.cpp
+++ b/Usermode/Applications/axwin4_src/Server/compositor.cpp
@@ -22,6 +22,19 @@ 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);
+	// TODO: Append to separate sub-lists (or to separate lists all together)
+	//   if flags AXWIN4_WNDFLAG_KEEPBELOW or AXWIN4_WNDFLAG_KEEPABOVE are set
+	m_windows.push_back(window);
+}
+void CCompositor::HideWindow(CWindow* window)
+{
+	DamageArea(window->m_surface.m_rect);
+	m_windows.remove(window);
+}
+
 bool CCompositor::GetScreenDims(unsigned int ScreenID, unsigned int* W, unsigned int* H)
 {
 	assert(W && H);
@@ -40,10 +53,11 @@ bool CCompositor::GetScreenDims(unsigned int ScreenID, unsigned int* W, unsigned
 
 void CCompositor::Redraw()
 {
-	_SysDebug("CCompositor::Redraw");
 	// Redraw the screen and clear damage rects
-	if( m_damageRects.empty() )
+	if( m_damageRects.empty() ) {
+		_SysDebug("- No damaged regions");
 		return ;
+	}
 	
 	// Build up foreground grid (Rects and windows)
 	// - This should already be built (mutated on window move/resize/reorder)
@@ -51,14 +65,14 @@ void CCompositor::Redraw()
 	// For all windows, check for intersection with damage rects
 	for( auto rect : m_damageRects )
 	{
-		_SysDebug("rect=(%i,%i) %ix%i", rect.m_x, rect.m_y, rect.m_w, rect.m_h);
 		// window list should be sorted by draw order (lowest first)
 		for( auto window : m_windows )
 		{
-			if( rect.HasIntersection( window->m_surface.m_rect ) )
+			if( window->m_is_shown && rect.HasIntersection( window->m_surface.m_rect ) )
 			{
 				// TODO: just reblit
 				CRect	rel_rect = window->m_surface.m_rect.RelativeIntersection(rect);
+				_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 );
 			}
@@ -83,7 +97,7 @@ void CCompositor::BlitFromSurface(const CSurface& dest, const CRect& src_rect)
 	for( unsigned int i = 0; i < src_rect.m_h; i ++ )
 	{
 		m_video.BlitLine(
-			dest.GetScanline(src_rect.m_y, src_rect.m_y),
+			dest.GetScanline(src_rect.m_y+i, src_rect.m_x),
 			dest.m_rect.m_y + src_rect.m_y + i,
 			dest.m_rect.m_x + src_rect.m_x,
 			src_rect.m_w
@@ -95,11 +109,18 @@ void CCompositor::MouseMove(unsigned int Cursor, unsigned int X, unsigned int Y,
 {
 	_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
 }
 
 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
+}
+
+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);
 }
 
 }	// namespace AxWin