frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Xnest: xnestWindowParent macro by xnest_upstream_window_parent() 

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-08-30 19:25:23 +02:00
parent 6f20cee79c
commit 56c646cb63
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
hw/xnest/Window.c
View File

@ -43,6 +43,17 @@ is" without express or implied warranty.
DevPrivateKeyRec xnestWindowPrivateKeyRec; DevPrivateKeyRec xnestWindowPrivateKeyRec;
/*
* retrieve the Window's parent upstream ID.
* if it's a toplevel window, return the root window instead
*/
static inline xcb_window_t xnest_upstream_window_parent(WindowPtr pWin)
{
return (pWin->parent ?
xnestWindow(pWin->parent) :
xnest_screen_priv(pWin->drawable.pScreen)->upstream_frame_window);
}
static int static int
xnestFindWindowMatch(WindowPtr pWin, void *ptr) xnestFindWindowMatch(WindowPtr pWin, void *ptr)
{ {
@ -121,7 +132,7 @@ xnestCreateWindow(WindowPtr pWin)
xcb_aux_create_window(xnestUpstreamInfo.conn, xcb_aux_create_window(xnestUpstreamInfo.conn,
pWin->drawable.depth, pWin->drawable.depth,
xnestWindowPriv(pWin)->window, xnestWindowPriv(pWin)->window,
xnestWindowParent(pWin), xnest_upstream_window_parent(pWin),
pWin->origin.x - wBorderWidth(pWin), pWin->origin.x - wBorderWidth(pWin),
pWin->origin.y - wBorderWidth(pWin), pWin->origin.y - wBorderWidth(pWin),
pWin->drawable.width, pWin->drawable.width,
@ -132,7 +143,7 @@ xnestCreateWindow(WindowPtr pWin)
mask, mask,
&attributes); &attributes);
xnestWindowPriv(pWin)->parent = xnestWindowParent(pWin); xnestWindowPriv(pWin)->parent = xnest_upstream_window_parent(pWin);
xnestWindowPriv(pWin)->x = pWin->origin.x - wBorderWidth(pWin); xnestWindowPriv(pWin)->x = pWin->origin.x - wBorderWidth(pWin);
xnestWindowPriv(pWin)->y = pWin->origin.y - wBorderWidth(pWin); xnestWindowPriv(pWin)->y = pWin->origin.y - wBorderWidth(pWin);
xnestWindowPriv(pWin)->width = pWin->drawable.width; xnestWindowPriv(pWin)->width = pWin->drawable.width;
@ -188,16 +199,16 @@ xnestConfigureWindow(WindowPtr pWin, unsigned int mask)
xcb_params_configure_window_t values; xcb_params_configure_window_t values;
if (mask & XCB_CONFIG_WINDOW_SIBLING && if (mask & XCB_CONFIG_WINDOW_SIBLING &&
xnestWindowPriv(pWin)->parent != xnestWindowParent(pWin)) { xnestWindowPriv(pWin)->parent != xnest_upstream_window_parent(pWin)) {
xcb_reparent_window( xcb_reparent_window(
xnestUpstreamInfo.conn, xnestUpstreamInfo.conn,
xnestWindow(pWin), xnestWindow(pWin),
xnestWindowParent(pWin), xnest_upstream_window_parent(pWin),
pWin->origin.x - wBorderWidth(pWin), pWin->origin.x - wBorderWidth(pWin),
pWin->origin.y - wBorderWidth(pWin)); pWin->origin.y - wBorderWidth(pWin));
xnestWindowPriv(pWin)->parent = xnestWindowParent(pWin); xnestWindowPriv(pWin)->parent = xnest_upstream_window_parent(pWin);
xnestWindowPriv(pWin)->x = pWin->origin.x - wBorderWidth(pWin); xnestWindowPriv(pWin)->x = pWin->origin.x - wBorderWidth(pWin);
xnestWindowPriv(pWin)->y = pWin->origin.y - wBorderWidth(pWin); xnestWindowPriv(pWin)->y = pWin->origin.y - wBorderWidth(pWin);
xnestWindowPriv(pWin)->sibling_above = XCB_WINDOW_NONE; xnestWindowPriv(pWin)->sibling_above = XCB_WINDOW_NONE;

5
hw/xnest/XNWindow.h
View File

@ -45,11 +45,6 @@ extern DevPrivateKeyRec xnestWindowPrivateKeyRec;
#define xnestWindow(pWin) (xnestWindowPriv(pWin)->window) #define xnestWindow(pWin) (xnestWindowPriv(pWin)->window)
#define xnestWindowParent(pWin) \
((pWin)->parent ? \
xnestWindow((pWin)->parent) : \
xnest_screen_priv(pWin->drawable.pScreen)->upstream_frame_window)
#define xnestWindowSiblingAbove(pWin) \ #define xnestWindowSiblingAbove(pWin) \
((pWin)->prevSib ? xnestWindow((pWin)->prevSib) : XCB_WINDOW_NONE) ((pWin)->prevSib ? xnestWindow((pWin)->prevSib) : XCB_WINDOW_NONE)