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

(!1654) Xnest: use XCB_CONFIG_WINDOW_* defines instead of CW* 

Use xcb's defines instead of Xlib's ones.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-08-09 18:00:16 +02:00
parent 9754a9d6db
commit b8240ab3e1
2 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
hw/xnest/Window.c
View File

@ -169,8 +169,12 @@ Bool
xnestPositionWindow(WindowPtr pWin, int x, int y)
{
xnestConfigureWindow(pWin,
CWParent |
CWX | CWY | CWWidth | CWHeight | CWBorderWidth);
XCB_CONFIG_WINDOW_SIBLING | \
XCB_CONFIG_WINDOW_X | \
XCB_CONFIG_WINDOW_Y | \
XCB_CONFIG_WINDOW_WIDTH | \
XCB_CONFIG_WINDOW_HEIGHT | \
XCB_CONFIG_WINDOW_BORDER_WIDTH);
return TRUE;
}
@ -181,7 +185,7 @@ xnestConfigureWindow(WindowPtr pWin, unsigned int mask)
unsigned int valuemask;
XWindowChanges values;
if (mask & CWParent &&
if (mask & XCB_CONFIG_WINDOW_SIBLING &&
xnestWindowPriv(pWin)->parent != xnestWindowParent(pWin)) {
XReparentWindow(xnestDisplay, xnestWindow(pWin),
xnestWindowParent(pWin),
@ -197,34 +201,34 @@ xnestConfigureWindow(WindowPtr pWin, unsigned int mask)
valuemask = 0;
if (mask & CWX &&
if (mask & XCB_CONFIG_WINDOW_X &&
xnestWindowPriv(pWin)->x != pWin->origin.x - wBorderWidth(pWin)) {
valuemask |= CWX;
valuemask |= XCB_CONFIG_WINDOW_X;
values.x =
xnestWindowPriv(pWin)->x = pWin->origin.x - wBorderWidth(pWin);
}
if (mask & CWY &&
if (mask & XCB_CONFIG_WINDOW_Y &&
xnestWindowPriv(pWin)->y != pWin->origin.y - wBorderWidth(pWin)) {
valuemask |= CWY;
valuemask |= XCB_CONFIG_WINDOW_Y;
values.y =
xnestWindowPriv(pWin)->y = pWin->origin.y - wBorderWidth(pWin);
}
if (mask & CWWidth && xnestWindowPriv(pWin)->width != pWin->drawable.width) {
valuemask |= CWWidth;
if (mask & XCB_CONFIG_WINDOW_WIDTH && xnestWindowPriv(pWin)->width != pWin->drawable.width) {
valuemask |= XCB_CONFIG_WINDOW_WIDTH;
values.width = xnestWindowPriv(pWin)->width = pWin->drawable.width;
}
if (mask & CWHeight &&
if (mask & XCB_CONFIG_WINDOW_HEIGHT &&
xnestWindowPriv(pWin)->height != pWin->drawable.height) {
valuemask |= CWHeight;
valuemask |= XCB_CONFIG_WINDOW_HEIGHT;
values.height = xnestWindowPriv(pWin)->height = pWin->drawable.height;
}
if (mask & CWBorderWidth &&
if (mask & XCB_CONFIG_WINDOW_BORDER_WIDTH &&
xnestWindowPriv(pWin)->border_width != pWin->borderWidth) {
valuemask |= CWBorderWidth;
valuemask |= XCB_CONFIG_WINDOW_BORDER_WIDTH;
values.border_width =
xnestWindowPriv(pWin)->border_width = pWin->borderWidth;
}
@ -232,7 +236,7 @@ xnestConfigureWindow(WindowPtr pWin, unsigned int mask)
if (valuemask)
XConfigureWindow(xnestDisplay, xnestWindow(pWin), valuemask, &values);
if (mask & CWStackingOrder &&
if (mask & XCB_CONFIG_WINDOW_SIBLING &&
xnestWindowPriv(pWin)->sibling_above != xnestWindowSiblingAbove(pWin)) {
WindowPtr pSib;
@ -240,14 +244,14 @@ xnestConfigureWindow(WindowPtr pWin, unsigned int mask)
for (pSib = pWin; pSib->prevSib != NullWindow; pSib = pSib->prevSib);
/* the top sibling */
valuemask = CWStackMode;
valuemask = XCB_CONFIG_WINDOW_STACK_MODE;
values.stack_mode = Above;
XConfigureWindow(xnestDisplay, xnestWindow(pSib), valuemask, &values);
xnestWindowPriv(pSib)->sibling_above = None;
/* the rest of siblings */
for (pSib = pSib->nextSib; pSib != NullWindow; pSib = pSib->nextSib) {
valuemask = CWSibling | CWStackMode;
valuemask = XCB_CONFIG_WINDOW_SIBLING | XCB_CONFIG_WINDOW_STACK_MODE;
values.sibling = xnestWindowSiblingAbove(pSib);
values.stack_mode = Below;
XConfigureWindow(xnestDisplay, xnestWindow(pSib), valuemask,
@ -354,7 +358,7 @@ xnestChangeWindowAttributes(WindowPtr pWin, unsigned long mask)
Bool
xnestRealizeWindow(WindowPtr pWin)
{
xnestConfigureWindow(pWin, CWStackingOrder);
xnestConfigureWindow(pWin, XCB_CONFIG_WINDOW_SIBLING);
xnestShapeWindow(pWin);
XMapWindow(xnestDisplay, xnestWindow(pWin));
@ -377,7 +381,7 @@ xnestCopyWindow(WindowPtr pWin, xPoint oldOrigin, RegionPtr oldRegion)
void
xnestClipNotify(WindowPtr pWin, int dx, int dy)
{
xnestConfigureWindow(pWin, CWStackingOrder);
xnestConfigureWindow(pWin, XCB_CONFIG_WINDOW_SIBLING);
xnestShapeWindow(pWin);
}

3
hw/xnest/XNWindow.h
View File

@ -55,9 +55,6 @@ extern DevPrivateKeyRec xnestWindowPrivateKeyRec;
#define xnestWindowSiblingBelow(pWin) \
((pWin)->nextSib ? xnestWindow((pWin)->nextSib) : None)
#define CWParent CWSibling
#define CWStackingOrder CWStackMode
WindowPtr xnestWindowPtr(Window window);
Bool xnestCreateWindow(WindowPtr pWin);
Bool xnestDestroyWindow(WindowPtr pWin);