Mirrors_UI_SDK/MiniGUI
1
0
Fork 0
mirror of https://github.com/VincentWei/MiniGUI.git synced 2026-09-26 12:27:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

enhance to support compositing type and argument for CreateMainWindowEx2

Browse Source
This commit is contained in:
Vincent Wei
2020-01-16 12:15:34 +08:00
parent 4f6a0aebf5
commit 46621017c8
5 changed files with 66 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/minigui.h
+3
View File
@@ -735,6 +735,7 @@ typedef void (* ON_CHANGE_LAYER) (int op, MG_Layer* layer,
#define ZNOP_STARTDRAG 13
#define ZNOP_CANCELDRAG 14
#define ZNOP_CHANGECAPTION 15
#define ZNOP_COMPOSITINGCHANGED 16
/**
* \var typedef void (* ON_ZNODE_OPERATION) (int op, int cli, int idx_znode)
@@ -832,6 +833,8 @@ extern MG_EXPORT ON_CHANGE_LAYER OnChangeLayer;
* Cancel to drag the z-node.
* - ZNOP_CHANGECAPTION\n
* The caption of the z-node has changed.
* - ZNOP_COMPOSITINGCHANGED\n
* The compositing type or the argument of the z-node has changed.
*
* The event will be passed through the argument of \a op; the
* pointers to the layer, the identifier of the client, and the index of
src/gui/window.c
+4 -2
View File
@@ -3605,10 +3605,11 @@ static void ResetMenuSize (HWND hwnd)
HWND GUIAPI CreateMainWindowEx2 (PMAINWINCREATE pCreateInfo,
const char* werdr_name, const WINDOW_ELEMENT_ATTR* we_attrs,
int compos_type, DWORD ct_arg,
int ct, DWORD ct_arg,
const char* window_name, const char* layer_name)
{
PMAINWIN pWin;
COMPOSITINGINFO ct_info = { ct, ct_arg };
if (pCreateInfo == NULL) {
return HWND_INVALID;
@@ -3788,7 +3789,8 @@ HWND GUIAPI CreateMainWindowEx2 (PMAINWINCREATE pCreateInfo,
pWin->pGCRInfo = &pWin->GCRInfo;
#endif
if (SendMessage (HWND_DESKTOP, MSG_ADDNEWMAINWIN, (WPARAM) pWin, 0) < 0)
if (SendMessage (HWND_DESKTOP, MSG_ADDNEWMAINWIN,
(WPARAM)pWin, (LPARAM)&ct_info) < 0)
goto err;
/* houhh20081127, Move these code into dskAddNewMainWindow().*/
src/kernel/desktop-comm.c
+4 -3
View File
@@ -190,9 +190,10 @@ static int dskAllocZOrderNode (PMAINWIN pWin)
dskGetWindowRectInScreen (pWin, &rc);
return AllocZOrderNode (0, (HWND)pWin,
(HWND)pWin->pMainWin,
get_znode_flags_from_style (pWin),
&rc, pWin->spCaption, HDC_INVALID);
(HWND)pWin->pMainWin,
get_znode_flags_from_style (pWin),
&rc, pWin->spCaption, HDC_INVALID,
CT_OPAQUE, 0);
}
/*
src/kernel/desktop-procs.c
+30 -12
View File
@@ -322,7 +322,7 @@ void __mg_start_client_desktop (void)
SendMessage (HWND_DESKTOP, MSG_STARTSESSION, 0, 0);
}
static intptr_t cliAllocZOrderNode (PMAINWIN pWin)
static intptr_t cliAllocZOrderNode (PMAINWIN pWin, const COMPOSITINGINFO* ct_info)
{
intptr_t ret;
REQUEST req;
@@ -354,6 +354,15 @@ static intptr_t cliAllocZOrderNode (PMAINWIN pWin)
info.surf_flags = pWin->surf->flags;
info.surf_size = pWin->surf->shared_header->buf_size;
info.surf_size += sizeof (*pWin->surf->shared_header);
if (ct_info) {
info.ct = ct_info->type;
info.ct_arg = ct_info->arg;
}
else {
info.ct = CT_OPAQUE;
info.ct_arg = 0;
}
if (ClientRequestEx2 (&req, NULL, 0, pWin->surf->shared_header->fd,
&ret, sizeof (intptr_t), NULL) < 0)
return -1;
@@ -786,7 +795,8 @@ ON_ZNODE_OPERATION OnZNodeOperation;
static int srvAllocZOrderNode (int cli, HWND hwnd, HWND main_win,
DWORD flags, const RECT *rc, const char *caption,
Uint32 surf_flags, size_t surf_size, int fd)
Uint32 surf_flags, size_t surf_size, int fd,
int ct, DWORD ct_arg)
{
int free_slot;
HDC memdc = HDC_INVALID;
@@ -825,7 +835,7 @@ static int srvAllocZOrderNode (int cli, HWND hwnd, HWND main_win,
#endif /* def _MGSCHEMA_COMPOSITING */
free_slot = AllocZOrderNode (cli, hwnd,
main_win, flags, rc, caption, memdc);
main_win, flags, rc, caption, memdc, ct, ct_arg);
if ((free_slot != -1) && OnZNodeOperation)
OnZNodeOperation (ZNOP_ALLOCATE, cli, free_slot);
@@ -1202,7 +1212,13 @@ static inline int srvSetZNodeAlwaysTop (int cli, int idx_znode, BOOL fSet)
static inline int srvSetZNodeCompositing (int cli, int idx_znode,
int type, DWORD arg)
{
return dskSetZNodeCompositing (cli, idx_znode, type, arg);
int ret;
ret = dskSetZNodeCompositing (cli, idx_znode, type, arg);
if (ret == 0 && OnZNodeOperation)
OnZNodeOperation (ZNOP_COMPOSITINGCHANGED, cli, idx_znode);
return ret;
}
#endif /* _MGSCHEMA_COMPOSITING */
@@ -1233,11 +1249,12 @@ intptr_t __mg_do_zorder_operation (int cli, const ZORDEROPINFO* info, int fd)
#ifdef _MGSCHEMA_COMPOSITING
ret = srvAllocZOrderNode (cli, info->hwnd, info->main_win,
info->flags, &info->rc, info->caption,
info->surf_flags, info->surf_size, fd);
info->surf_flags, info->surf_size, fd,
info->ct, info->ct_arg);
#else
ret = srvAllocZOrderNode (cli, info->hwnd, info->main_win,
info->flags, &info->rc, info->caption,
0, 0, fd);
0, 0, fd, CT_OPAQUE, 0);
#endif
break;
case ID_ZOOP_FREE:
@@ -1591,7 +1608,7 @@ static HWND dskSetActiveWindow (PMAINWIN pWin)
*
* Return 0 if OK, else -1;
*/
static int dskAddNewMainWindow (PMAINWIN pWin)
static int dskAddNewMainWindow (PMAINWIN pWin, const COMPOSITINGINFO* ct_info)
{
RECT rcWin;
@@ -1599,10 +1616,11 @@ static int dskAddNewMainWindow (PMAINWIN pWin)
memcpy (&rcWin, &pWin->left, sizeof (RECT));
pWin->idx_znode = srvAllocZOrderNode (0, (HWND)pWin, (HWND)pWin->pMainWin,
get_znode_flags_from_style (pWin),
&rcWin, pWin->spCaption, 0, 0, -1);
&rcWin, pWin->spCaption, 0, 0, -1,
ct_info->type, ct_info->arg);
}
else
pWin->idx_znode = cliAllocZOrderNode (pWin);
pWin->idx_znode = cliAllocZOrderNode (pWin, ct_info);
if (pWin->idx_znode <= 0)
return -1;
@@ -2295,7 +2313,7 @@ static LRESULT dskWindowMessageHandler (UINT message, PMAINWIN pWin, LPARAM lPar
{
switch (message) {
case MSG_ADDNEWMAINWIN:
return dskAddNewMainWindow (pWin);
return dskAddNewMainWindow (pWin, (const COMPOSITINGINFO *)lParam);
case MSG_REMOVEMAINWIN:
dskRemoveMainWindow (pWin);
@@ -2984,9 +3002,9 @@ static int dskOnNewCtrlInstance (PCONTROL pParent, PCONTROL pNewCtrl)
pNewCtrl->idx_znode = srvAllocZOrderNode (0,
(HWND)pNewCtrl, (HWND)pNewCtrl->pMainWin,
get_znode_flags_from_style ((PMAINWIN)pNewCtrl),
&rcWin, pNewCtrl->spCaption, 0, 0, -1);
&rcWin, pNewCtrl->spCaption, 0, 0, -1, CT_OPAQUE, 0);
else
pNewCtrl->idx_znode = cliAllocZOrderNode ((PMAINWIN)pNewCtrl);
pNewCtrl->idx_znode = cliAllocZOrderNode ((PMAINWIN)pNewCtrl, NULL);
if (pNewCtrl->idx_znode <= 0)
return -1;
src/kernel/desktop.c
+25 -20
View File
@@ -1621,8 +1621,30 @@ int CreateNodeRoundMaskRect (ZORDERINFO* zi, ZORDERNODE* node,
return 0;
}
#ifdef _MGSCHEMA_COMPOSITING
static inline DWORD compositing_type_to_flag (int type)
{
switch (type) {
case CT_OPAQUE:
default:
return ZOF_COMPOS_OPAQUE;
case CT_COLORKEY:
return ZOF_COMPOS_COLORKEY;
case CT_ALPHACHANNEL:
return ZOF_COMPOS_ALPHACHANNEL;
case CT_ALPHAPIXEL:
return ZOF_COMPOS_ALPHAPIXEL;
case CT_BLURRED:
return ZOF_COMPOS_BLURRED;
}
return ZOF_COMPOS_OPAQUE;
}
#endif /* defined _MGSCHEMA_COMPOSITING */
static int AllocZOrderNode (int cli, HWND hwnd, HWND main_win,
DWORD flags, const RECT *rc, const char *caption, HDC mem_dc)
DWORD flags, const RECT *rc, const char *caption,
HDC mem_dc, int ct, DWORD ct_arg)
{
DWORD type = flags & ZOF_TYPE_MASK;
ZORDERINFO* zi = _get_zorder_info(cli);
@@ -1700,6 +1722,8 @@ static int AllocZOrderNode (int cli, HWND hwnd, HWND main_win,
nodes [free_slot].main_win = main_win;
#ifdef _MGSCHEMA_COMPOSITING
nodes [free_slot].mem_dc = mem_dc;
nodes [free_slot].flags |= compositing_type_to_flag(ct);
nodes [free_slot].ct_arg = ct_arg;
#endif
nodes [free_slot].idx_mask_rect = 0;
@@ -2288,25 +2312,6 @@ void __mg_screensaver_destroy(void)
#endif /* defined _MG_ENABLE_SCREENSAVER */
#ifdef _MGSCHEMA_COMPOSITING
static inline DWORD compositing_type_to_flag (int type)
{
switch (type) {
case CT_OPAQUE:
default:
return ZOF_COMPOS_OPAQUE;
case CT_COLORKEY:
return ZOF_COMPOS_COLORKEY;
case CT_ALPHACHANNEL:
return ZOF_COMPOS_ALPHACHANNEL;
case CT_ALPHAPIXEL:
return ZOF_COMPOS_ALPHAPIXEL;
case CT_BLURRED:
return ZOF_COMPOS_BLURRED;
}
return ZOF_COMPOS_OPAQUE;
}
/* Since 4.2.0 */
static int dskSetZNodeCompositing (int cli, int idx_znode, int ct, DWORD ct_arg)
{