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

rootless: Fixup some format errors in debug logging 

Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
This commit is contained in:
Jeremy Huddleston Sequoia 2023-01-01 10:47:17 -08:00
parent 711d491729
commit 20f5b270d3
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
miext/rootless/rootlessCommon.h
View File

@ -282,4 +282,5 @@ void RootlessDisableRoot(ScreenPtr pScreen);
void RootlessSetPixmapOfAncestors(WindowPtr pWin); void RootlessSetPixmapOfAncestors(WindowPtr pWin);
unsigned long RootlessWID(WindowPtr pWindow);
#endif /* _ROOTLESSCOMMON_H */ #endif /* _ROOTLESSCOMMON_H */

8
miext/rootless/rootlessGC.c
View File

@ -549,7 +549,7 @@ RootlessCopyArea(DrawablePtr pSrc, DrawablePtr dst, GCPtr pGC,
GC_SAVE(pGC); GC_SAVE(pGC);
GCOP_UNWRAP(pGC); GCOP_UNWRAP(pGC);
RL_DEBUG_MSG("copy area start (src 0x%x, dst 0x%x)", pSrc, dst); RL_DEBUG_MSG("copy area start (src %p, dst %p)", pSrc, dst);
if (pSrc->type == DRAWABLE_WINDOW && IsFramedWindow((WindowPtr) pSrc)) { if (pSrc->type == DRAWABLE_WINDOW && IsFramedWindow((WindowPtr) pSrc)) {
/* If both source and dest are windows, and we're doing /* If both source and dest are windows, and we're doing
@ -800,7 +800,7 @@ static void
RootlessPolySegment(DrawablePtr dst, GCPtr pGC, int nseg, xSegment * pSeg) RootlessPolySegment(DrawablePtr dst, GCPtr pGC, int nseg, xSegment * pSeg)
{ {
GCOP_UNWRAP(pGC); GCOP_UNWRAP(pGC);
RL_DEBUG_MSG("poly segment start (win 0x%x)", dst); RL_DEBUG_MSG("poly segment start (dst %p)", dst);
RootlessStartDrawing((WindowPtr) dst); RootlessStartDrawing((WindowPtr) dst);
pGC->ops->PolySegment(dst, pGC, nseg, pSeg); pGC->ops->PolySegment(dst, pGC, nseg, pSeg);
@ -998,7 +998,7 @@ RootlessFillPolygon(DrawablePtr dst, GCPtr pGC,
{ {
GC_SAVE(pGC); GC_SAVE(pGC);
GCOP_UNWRAP(pGC); GCOP_UNWRAP(pGC);
RL_DEBUG_MSG("fill poly start (win 0x%x, fillStyle 0x%x)", dst, RL_DEBUG_MSG("fill poly start (dst %p, fillStyle 0x%x)", dst,
pGC->fillStyle); pGC->fillStyle);
if (count <= 2) { if (count <= 2) {
@ -1072,7 +1072,7 @@ RootlessPolyFillRect(DrawablePtr dst, GCPtr pGC,
{ {
GC_SAVE(pGC); GC_SAVE(pGC);
GCOP_UNWRAP(pGC); GCOP_UNWRAP(pGC);
RL_DEBUG_MSG("fill rect start (win 0x%x, fillStyle 0x%x)", dst, RL_DEBUG_MSG("fill rect start (dst %p, fillStyle 0x%x)", dst,
pGC->fillStyle); pGC->fillStyle);
if (nRectsInit <= 0) { if (nRectsInit <= 0) {

12
miext/rootless/rootlessWindow.c
View File

@ -325,7 +325,7 @@ RootlessPositionWindow(WindowPtr pWin, int x, int y)
RootlessWindowRec *winRec = WINREC(pWin); RootlessWindowRec *winRec = WINREC(pWin);
Bool result; Bool result;
RL_DEBUG_MSG("positionwindow start (win 0x%x @ %i, %i)\n", pWin, x, y); RL_DEBUG_MSG("positionwindow start (win %p (%lu) @ %i, %i)\n", pWin, RootlessWID(pWin), x, y);
if (winRec) { if (winRec) {
if (winRec->is_drawing) { if (winRec->is_drawing) {
@ -441,7 +441,7 @@ RootlessRealizeWindow(WindowPtr pWin)
RegionRec saveRoot; RegionRec saveRoot;
ScreenPtr pScreen = pWin->drawable.pScreen; ScreenPtr pScreen = pWin->drawable.pScreen;
RL_DEBUG_MSG("realizewindow start (win 0x%x) ", pWin); RL_DEBUG_MSG("realizewindow start (win %p (%lu)) ", pWin, RootlessWID(pWin));
if ((IsTopLevel(pWin) && pWin->drawable.class == InputOutput)) { if ((IsTopLevel(pWin) && pWin->drawable.class == InputOutput)) {
RootlessWindowRec *winRec; RootlessWindowRec *winRec;
@ -664,7 +664,7 @@ RootlessResizeCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg,
RegionRec rgnDst; RegionRec rgnDst;
int dx, dy; int dx, dy;
RL_DEBUG_MSG("resizecopywindowFB start (win 0x%x) ", pWin); RL_DEBUG_MSG("resizecopywindowFB start (win %p (%lu)) ", pWin, RootlessWID(pWin));
/* Don't unwrap pScreen->CopyWindow. /* Don't unwrap pScreen->CopyWindow.
The bogus rewrap with RootlessCopyWindow causes a crash if The bogus rewrap with RootlessCopyWindow causes a crash if
@ -733,7 +733,7 @@ RootlessCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
BoxPtr extents; BoxPtr extents;
int area; int area;
RL_DEBUG_MSG("copywindowFB start (win 0x%x) ", pWin); RL_DEBUG_MSG("copywindowFB start (win %p (%lu)) ", pWin, RootlessWID(pWin));
SCREEN_UNWRAP(pScreen, CopyWindow); SCREEN_UNWRAP(pScreen, CopyWindow);
@ -1268,7 +1268,7 @@ RootlessResizeWindow(WindowPtr pWin, int x, int y,
Bool resize_after = FALSE; Bool resize_after = FALSE;
RegionRec saveRoot; RegionRec saveRoot;
RL_DEBUG_MSG("resizewindow start (win 0x%x) ", pWin); RL_DEBUG_MSG("resizewindow start (win %p (%lu)) ", pWin, RootlessWID(pWin));
if (pWin->parent) { if (pWin->parent) {
if (winRec) { if (winRec) {
@ -1649,7 +1649,7 @@ RootlessSetPixmapOfAncestors(WindowPtr pWin)
XID pixel = 0; XID pixel = 0;
ChangeWindowAttributes(pWin, CWBackPixel, &pixel, serverClient); ChangeWindowAttributes(pWin, CWBackPixel, &pixel, serverClient);
RL_DEBUG_MSG("Cleared ParentRelative on 0x%x.\n", pWin); RL_DEBUG_MSG("Cleared ParentRelative on %p (%lu).\n", pWin, RootlessWID(pWin));
break; break;
} }