Usermode/AxWin4 - Working in shared memory usage

[tpg/acess2.git] / Usermode / Applications / axwin4_src / Server / compositor.cpp

diff --git a/Usermode/Applications/axwin4_src/Server/compositor.cpp b/Usermode/Applications/axwin4_src/Server/compositor.cpp
index 4052145..699b6a2 100644 (file)
--- 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);
@@ -41,8 +54,10 @@ bool CCompositor::GetScreenDims(unsigned int ScreenID, unsigned int* W, unsigned
 void 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)
@@ -53,10 +68,11 @@ void CCompositor::Redraw()
                // 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 );
                        }
@@ -81,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, 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
@@ -89,5 +105,23 @@ 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);
+       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