(!1654) Xnest: replace XConfigureWindow() calls by xcb_configure_window()
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
		
							parent
							
								
									7bce15e99b
								
							
						
					
					
						commit
						5694b4f2e1
					
				| 
						 | 
				
			
			@ -190,7 +190,7 @@ void
 | 
			
		|||
xnestConfigureWindow(WindowPtr pWin, unsigned int mask)
 | 
			
		||||
{
 | 
			
		||||
    unsigned int valuemask;
 | 
			
		||||
    XWindowChanges values;
 | 
			
		||||
    xcb_params_configure_window_t values;
 | 
			
		||||
 | 
			
		||||
    if (mask & XCB_CONFIG_WINDOW_SIBLING  &&
 | 
			
		||||
        xnestWindowPriv(pWin)->parent != xnestWindowParent(pWin)) {
 | 
			
		||||
| 
						 | 
				
			
			@ -240,8 +240,7 @@ xnestConfigureWindow(WindowPtr pWin, unsigned int mask)
 | 
			
		|||
            xnestWindowPriv(pWin)->border_width = pWin->borderWidth;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    if (valuemask)
 | 
			
		||||
        XConfigureWindow(xnestDisplay, xnestWindow(pWin), valuemask, &values);
 | 
			
		||||
    xcb_aux_configure_window(xnestUpstreamInfo.conn, xnestWindow(pWin), valuemask, &values);
 | 
			
		||||
 | 
			
		||||
    if (mask & XCB_CONFIG_WINDOW_SIBLING &&
 | 
			
		||||
        xnestWindowPriv(pWin)->sibling_above != xnestWindowSiblingAbove(pWin)) {
 | 
			
		||||
| 
						 | 
				
			
			@ -253,7 +252,8 @@ xnestConfigureWindow(WindowPtr pWin, unsigned int mask)
 | 
			
		|||
        /* the top sibling */
 | 
			
		||||
        valuemask = XCB_CONFIG_WINDOW_STACK_MODE;
 | 
			
		||||
        values.stack_mode = Above;
 | 
			
		||||
        XConfigureWindow(xnestDisplay, xnestWindow(pSib), valuemask, &values);
 | 
			
		||||
 | 
			
		||||
        xcb_aux_configure_window(xnestUpstreamInfo.conn, xnestWindow(pSib), valuemask, &values);
 | 
			
		||||
        xnestWindowPriv(pSib)->sibling_above = XCB_WINDOW_NONE;
 | 
			
		||||
 | 
			
		||||
        /* the rest of siblings */
 | 
			
		||||
| 
						 | 
				
			
			@ -261,8 +261,7 @@ xnestConfigureWindow(WindowPtr pWin, unsigned int mask)
 | 
			
		|||
            valuemask = XCB_CONFIG_WINDOW_SIBLING | XCB_CONFIG_WINDOW_STACK_MODE;
 | 
			
		||||
            values.sibling = xnestWindowSiblingAbove(pSib);
 | 
			
		||||
            values.stack_mode = Below;
 | 
			
		||||
            XConfigureWindow(xnestDisplay, xnestWindow(pSib), valuemask,
 | 
			
		||||
                             &values);
 | 
			
		||||
            xcb_aux_configure_window(xnestUpstreamInfo.conn, xnestWindow(pSib), valuemask, &values);
 | 
			
		||||
            xnestWindowPriv(pSib)->sibling_above =
 | 
			
		||||
                xnestWindowSiblingAbove(pSib);
 | 
			
		||||
        }
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue