(!1705) xwin: drop wrapping on ScreenRec->RestackWindow()
This proc vector is optional (callers check for non-null) and neither fb nor mi set it, so we can just assign our function directly. No need for wrapping. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
		
							parent
							
								
									fdd94d7a2a
								
							
						
					
					
						commit
						b5844fca4d
					
				|  | @ -503,7 +503,6 @@ typedef struct _winPrivScreenRec { | ||||||
|     PostValidateTreeProcPtr PostValidateTree; |     PostValidateTreeProcPtr PostValidateTree; | ||||||
|     ClearToBackgroundProcPtr ClearToBackground; |     ClearToBackgroundProcPtr ClearToBackground; | ||||||
|     ClipNotifyProcPtr ClipNotify; |     ClipNotifyProcPtr ClipNotify; | ||||||
|     RestackWindowProcPtr RestackWindow; |  | ||||||
|     ResizeWindowProcPtr ResizeWindow; |     ResizeWindowProcPtr ResizeWindow; | ||||||
|     MoveWindowProcPtr MoveWindow; |     MoveWindowProcPtr MoveWindow; | ||||||
|     ModifyPixmapHeaderProcPtr ModifyPixmapHeader; |     ModifyPixmapHeaderProcPtr ModifyPixmapHeader; | ||||||
|  |  | ||||||
|  | @ -398,11 +398,6 @@ winRestackWindowMultiWindow(WindowPtr pWin, WindowPtr pOldNextSib) | ||||||
|     winTrace("winRestackMultiWindow - %p\n", pWin); |     winTrace("winRestackMultiWindow - %p\n", pWin); | ||||||
| #endif | #endif | ||||||
| 
 | 
 | ||||||
|     WIN_UNWRAP(RestackWindow); |  | ||||||
|     if (pScreen->RestackWindow) |  | ||||||
|         (*pScreen->RestackWindow) (pWin, pOldNextSib); |  | ||||||
|     WIN_WRAP(RestackWindow, winRestackWindowMultiWindow); |  | ||||||
| 
 |  | ||||||
| #if 1 | #if 1 | ||||||
|     /*
 |     /*
 | ||||||
|      * Calling winReorderWindowsMultiWindow here means our window manager |      * Calling winReorderWindowsMultiWindow here means our window manager | ||||||
|  |  | ||||||
|  | @ -402,7 +402,6 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv) | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|         /* Save a pointer to each lower-level window procedure */ |         /* Save a pointer to each lower-level window procedure */ | ||||||
|         WRAP(RestackWindow); |  | ||||||
|         WRAP(ResizeWindow); |         WRAP(ResizeWindow); | ||||||
|         WRAP(MoveWindow); |         WRAP(MoveWindow); | ||||||
|         WRAP(ModifyPixmapHeader); |         WRAP(ModifyPixmapHeader); | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue