X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Faxwin4_src%2FServer%2FCWindow.cpp;h=7d50b7b403052be921f657b9d01bd175cb5dfd9f;hb=6fbf6b93bec9b8b5bd6d7c683eefb0ebed8dff77;hp=0090eecadf7b9b2103c4516328c4389b3d028554;hpb=0868c6e02b76236ea70a6daa232b3c373f61e131;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/axwin4_src/Server/CWindow.cpp b/Usermode/Applications/axwin4_src/Server/CWindow.cpp
index 0090eeca..7d50b7b4 100644
--- a/Usermode/Applications/axwin4_src/Server/CWindow.cpp
+++ b/Usermode/Applications/axwin4_src/Server/CWindow.cpp
@@ -8,14 +8,17 @@
 #include <CWindow.hpp>
 #include <CCompositor.hpp>
 #include <assert.h>
+#include <ipc.hpp>
 
 namespace AxWin {
 
-CWindow::CWindow(CCompositor& compositor, CClient& client, const ::std::string& name):
+CWindow::CWindow(CCompositor& compositor, CClient& client, const ::std::string& name, unsigned int id):
 	m_surface(0,0,0,0),
 	m_compositor(compositor),
 	m_client(client),
-	m_name(name)
+	m_id(id),
+	m_name(name),
+	m_is_shown(false)
 {
 	_SysDebug("CWindow::CWindow()");
 }
@@ -26,30 +29,42 @@ CWindow::~CWindow()
 
 void CWindow::Repaint(const CRect& rect)
 {
-	#if 0
-	for( auto rgn : m_regions )
+	if( m_is_shown )
 	{
-		if( rect.Contains(rgn->m_rect) )
-		{
-			CRect	rel_rect(rect, rgn->m_rect);
-			rgn->Repaint(m_surface, rel_rect);
-		} 
+		CRect	outrect(
+			m_surface.m_rect.m_x + rect.m_x, 
+			m_surface.m_rect.m_y + rect.m_y, 
+			rect.m_w, rect.m_h
+			);
+		m_compositor.DamageArea(outrect);
 	}
-	#endif
 }
 
 void CWindow::Show(bool bShow)
 {
-	assert(!"TODO: CWindow::Show");
+	if( m_is_shown == bShow )
+		return;
+	
+	if( bShow )
+		m_compositor.ShowWindow( this );
+	else
+		m_compositor.HideWindow( this );
+	m_is_shown = bShow;
 }
 
 void CWindow::Move(int X, int Y)
 {
-	assert(!"TODO: CWindow::Move");
+	m_surface.m_rect.Move(X, Y);
 }
 void CWindow::Resize(unsigned int W, unsigned int H)
 {
-	assert(!"TODO: CWindow::Resize");
+	m_surface.Resize(W, H);
+	IPC::SendMessage_NotifyDims(m_client, m_id, W, H);
+}
+void CWindow::SetFlags(uint32_t Flags)
+{
+	// TODO: CWindow::SetFlags
+	_SysDebug("TOOD: CWindow::SetFlags");
 }
 uint64_t CWindow::ShareSurface()
 {
@@ -59,14 +74,26 @@ uint64_t CWindow::ShareSurface()
 
 void CWindow::MouseButton(int ButtonID, int X, int Y, bool Down)
 {
+	IPC::SendMessage_MouseButton(m_client, m_id, X, Y, ButtonID, Down);
 }
 
 void CWindow::MouseMove(int NewX, int NewY)
 {
+	// TODO: Only enable move events if client requests them
+	//IPC::SendMessage_MouseMove(m_client, m_id, NewX, NewY);
 }
 
 void CWindow::KeyEvent(::uint32_t Scancode, const ::std::string &Translated, bool Down)
 {
+	IPC::SendMessage_KeyEvent(m_client, m_id, Scancode, Down, Translated.c_str());
+}
+
+
+void CWindow::DrawScanline(unsigned int row, unsigned int x, unsigned int w, const uint8_t *data)
+{
+	m_surface.DrawScanline(row, x, w, data);
+	CRect	damaged( m_surface.m_rect.m_x+x, m_surface.m_rect.m_y+row, w, 1 );
+	m_compositor.DamageArea(damaged);
 }
 
 };