#include <decorator.h>
// === IMPORTS ===
-extern void IPC_SendWMMessage(tIPC_Client *Client, uint32_t Src, uint32_t Dst, int Msg, int Len, void *Data);
+extern void IPC_SendWMMessage(tIPC_Client *Client, uint32_t Src, uint32_t Dst, int Msg, int Len, const void *Data);
+extern tWindow *IPC_int_GetWindow(tIPC_Client *Client, uint32_t ID);
// === GLOBALS ===
tWMRenderer *gpWM_Renderers;
tWindow *gpWM_RootWindow;
//! Window which will recieve the next keyboard event
tWindow *gpWM_FocusedWindow;
+//! Hilighted window (owner of the currently focused window)
+tWindow *gpWM_HilightedWindow;
// === CODE ===
void WM_Initialise(void)
if(renderer == NULL)
return NULL;
- if(!Parent)
- Parent = gpWM_RootWindow;
-
// - Call create window function
ret = renderer->CreateWindow(RendererArg);
ret->Client = Client;
ret->ID = ID;
ret->Parent = Parent;
+ if(!ret->Parent)
+ ret->Parent = gpWM_RootWindow;
+ ret->Owner = Parent;
ret->Renderer = renderer;
ret->Flags |= WINFLAG_CLEAN; // Needed to stop invaildate early exiting
// Append to parent
- if(Parent)
+ if(ret->Parent)
{
- if(Parent->LastChild)
- Parent->LastChild->NextSibling = ret;
+ if(ret->Parent->LastChild)
+ ret->Parent->LastChild->NextSibling = ret;
else
- Parent->FirstChild = ret;
- ret->PrevSibling = Parent->LastChild;
- Parent->LastChild = ret;
+ ret->Parent->FirstChild = ret;
+ ret->PrevSibling = ret->Parent->LastChild;
+ ret->Parent->LastChild = ret;
ret->NextSibling = NULL;
}
else
}
// Don't decorate child windows by default
- if(Parent != gpWM_RootWindow)
+ if(Parent)
{
ret->Flags |= WINFLAG_NODECORATE;
}
return ret;
}
+tWindow *WM_GetWindowByID(tWindow *Requester, uint32_t ID)
+{
+ return IPC_int_GetWindow(Requester->Client, ID);
+}
+
tWindow *WM_CreateWindowStruct(size_t ExtraSize)
{
tWindow *ret;
_msg.Val = 1;
WM_SendMessage(NULL, Destination, WNDMSG_FOCUS, sizeof(_msg), &_msg);
+ WM_Invalidate(gpWM_FocusedWindow);
+ WM_Invalidate(Destination);
gpWM_FocusedWindow = Destination;
+
+
+ // Get the owner of the focused window
+// while(Destination && Destination->Owner) Destination = Destination->Owner;
+// gpWM_HilightedWindow = Destination;
}
void WM_ShowWindow(tWindow *Window, int bShow)
{
- // Message window
struct sWndMsg_Bool _msg;
if( !!(Window->Flags & WINFLAG_SHOW) == bShow )
return ;
+ // Message window
_msg.Val = !!bShow;
WM_SendMessage(NULL, Window, WNDMSG_SHOW, sizeof(_msg), &_msg);
-
+
+ // Update the flag
if(bShow)
Window->Flags |= WINFLAG_SHOW;
- else {
+ else
+ {
Window->Flags &= ~WINFLAG_SHOW;
+
if( Window == gpWM_FocusedWindow )
WM_FocusWindow(Window->Parent);
+
+ // Just a little memory saving for large hidden windows
+ if(Window->RenderBuffer) {
+ free(Window->RenderBuffer);
+ Window->RenderBuffer = NULL;
+ }
}
- // Just a little memory saving for large hidden windows
- if(Window->RenderBuffer)
- free(Window->RenderBuffer);
WM_Invalidate(Window);
}
Window->Flags |= WINFLAG_NODECORATE;
// Needed because the window size changes
- if(Window->RenderBuffer)
+ if(Window->RenderBuffer) {
free(Window->RenderBuffer);
+ Window->RenderBuffer = NULL;
+ }
WM_Invalidate(Window);
}
+void WM_SetRelative(tWindow *Window, int bRelativeToParent)
+{
+// _SysDebug("WM_SetRelative: (%p{Parent=%p},%i)", Window, Window->Parent, bRelativeToParent);
+ // No meaning if no parent
+ if( !Window->Parent )
+ return ;
+
+ // Check that the flag is changing
+ if( !!bRelativeToParent == !!(Window->Flags & WINFLAG_RELATIVE) )
+ return ;
+
+ if( bRelativeToParent ) {
+ // Set
+ Window->Flags |= WINFLAG_RELATIVE;
+ WM_MoveWindow(Window, Window->X, Window->Y);
+ }
+ else {
+ // Clear
+ Window->Flags &= ~WINFLAG_RELATIVE;
+ WM_MoveWindow(Window, Window->X - Window->Parent->X, Window->Y - Window->Parent->Y);
+ }
+}
+
int WM_MoveWindow(tWindow *Window, int X, int Y)
{
+// _SysDebug("Move %p to (%i,%i)", Window, X, Y);
// Clip coordinates
if(X + Window->W < 0) X = -Window->W + 1;
if(Y + Window->H < 0) Y = -Window->H + 1;
if(X >= giScreenWidth) X = giScreenWidth - 1;
if(Y >= giScreenHeight) Y = giScreenHeight - 1;
+ // If relative to the parent, extra checks
+ if( (Window->Flags & WINFLAG_RELATIVE) && Window->Parent )
+ {
+ if( X > Window->Parent->W ) return 1;
+ if( Y > Window->Parent->H ) return 1;
+ }
+ // TODO: Re-sanitise
+
Window->X = X; Window->Y = Y;
+ // TODO: Why invalidate buffer?
WM_Invalidate(Window);
return 0;
if(Window->X + W < 0) Window->X = -W + 1;
if(Window->Y + H < 0) Window->Y = -H + 1;
+ if( Window->W == W && Window->H == H )
+ return 0;
+
Window->W = W; Window->H = H;
- if(Window->RenderBuffer)
+ if(Window->RenderBuffer) {
free(Window->RenderBuffer);
+ Window->RenderBuffer = NULL;
+ }
WM_Invalidate(Window);
{
return 0;
}
-int WM_SendMessage(tWindow *Source, tWindow *Dest, int Message, int Length, void *Data)
+int WM_SendMessage(tWindow *Source, tWindow *Dest, int Message, int Length, const void *Data)
{
if(Dest == NULL) return -2;
if(Length > 0 && Data == NULL) return -1;
+
+ if( Decorator_HandleMessage(Dest, Message, Length, Data) != 1 )
+ {
+ // TODO: Catch errors from ->HandleMessage
+ return 0;
+ }
// ->HandleMessage returns 1 when the message was not handled
if( Dest->Renderer->HandleMessage(Dest, Message, Length, Data) != 1 )
void WM_Invalidate(tWindow *Window)
{
- _SysDebug("Invalidating %p", Window);
+ if(!Window) return ;
+// _SysDebug("Invalidating %p", Window);
// Don't invalidate twice (speedup)
// if( !(Window->Flags & WINFLAG_CLEAN) ) return;
// --- Rendering / Update
void WM_int_UpdateWindow(tWindow *Window)
{
- tWindow *child;
+ int bDecoratorRedraw = 0;
// Ignore hidden windows
if( !(Window->Flags & WINFLAG_SHOW) )
// Calculate RealW/RealH
if( !(Window->Flags & WINFLAG_NODECORATE) )
{
- _SysDebug("Applying decorations to %p", Window);
+ //_SysDebug("Applying decorations to %p", Window);
Decorator_UpdateBorderSize(Window);
Window->RealW = Window->BorderL + Window->W + Window->BorderR;
Window->RealH = Window->BorderT + Window->H + Window->BorderB;
- Decorator_Redraw(Window);
+ bDecoratorRedraw = 1;
}
else
{
Window->RealH = Window->H;
}
+ if( (Window->Flags & WINFLAG_RELATIVE) && Window->Parent )
+ {
+ Window->RealX = Window->Parent->X + Window->Parent->BorderL + Window->X;
+ Window->RealY = Window->Parent->Y + Window->Parent->BorderT + Window->Y;
+ }
+ else
+ {
+ Window->RealX = Window->X;
+ Window->RealY = Window->Y;
+ }
+
Window->Renderer->Redraw(Window);
Window->Flags |= WINFLAG_CLEAN;
}
// Process children
if( !(Window->Flags & WINFLAG_CHILDCLEAN) )
{
+ tWindow *child;
for( child = Window->FirstChild; child; child = child->NextSibling )
{
WM_int_UpdateWindow(child);
Window->Flags |= WINFLAG_CHILDCLEAN;
}
+ if( bDecoratorRedraw )
+ Decorator_Redraw(Window);
}
void WM_int_BlitWindow(tWindow *Window)
if( !(Window->Flags & WINFLAG_SHOW) )
return ;
- _SysDebug("Blit %p to (%i,%i) %ix%i", Window, Window->X, Window->Y, Window->RealW, Window->RealH);
- Video_Blit(Window->RenderBuffer, Window->X, Window->Y, Window->RealW, Window->RealH);
+// _SysDebug("Blit %p (%p) to (%i,%i) %ix%i", Window, Window->RenderBuffer,
+// Window->RealX, Window->RealY, Window->RealW, Window->RealH);
+ Video_Blit(Window->RenderBuffer, Window->RealX, Window->RealY, Window->RealW, Window->RealH);
+ if( Window == gpWM_FocusedWindow && Window->CursorW )
+ {
+ Video_FillRect(
+ Window->RealX + Window->BorderL + Window->CursorX,
+ Window->RealY + Window->BorderT + Window->CursorY,
+ Window->CursorW, Window->CursorH,
+ 0x000000
+ );
+ }
+
for( child = Window->FirstChild; child; child = child->NextSibling )
{
WM_int_BlitWindow(child);
git.ucc.asn.au / tpg / acess2.git / blobdiff
UCC git Repository :: git.ucc.asn.au