fix build issue for x86_64 84/26184/1
authorBoram Park <boram1288.park@samsung.com>
Tue, 19 Aug 2014 06:22:29 +0000 (15:22 +0900)
committerBoram Park <boram1288.park@samsung.com>
Tue, 19 Aug 2014 06:22:29 +0000 (15:22 +0900)
Change-Id: I74e03e453298437cf094d92072f623c32760cc4f

common/xdbg_evlog.c
common/xdbg_evlog_composite.c
common/xdbg_evlog_core.c
common/xdbg_evlog_damage.c
common/xdbg_evlog_dri2.c
common/xdbg_evlog_gesture.c
common/xdbg_evlog_randr.c
common/xdbg_evlog_xext.c
common/xdbg_evlog_xinput.c
common/xdbg_evlog_xv.c
module/xdbg_module_evlog.c

index 6f65964..c3f638a 100644 (file)
@@ -468,9 +468,9 @@ xDbgEvlogFillLog (EvlogInfo *evinfo, int detail_level, char *reply, int *len)
     }
     else if (evinfo->type == ERROR)
     {
-        REPLY("(ErrorCode(0x%02x) resourceID(0x%lx) majorCode(%d) minorCode(%d))",
+        REPLY("(ErrorCode(0x%02x) resourceID(0x%x) majorCode(%d) minorCode(%d))",
             evinfo->err.errorCode,
-            evinfo->err.resourceID,
+            (unsigned int)evinfo->err.resourceID,
             evinfo->err.majorCode,
             evinfo->err.minorCode);
     }
@@ -548,7 +548,7 @@ char* xDbgGetAtom(Atom atom, EvlogInfo *evinfo, char *reply, int *len)
     if (NameForAtom(atom))
         snprintf (table->buf, XDBG_BUF_SIZE, "%s", (char*)NameForAtom(atom));
     else
-        snprintf (table->buf, XDBG_BUF_SIZE, "0x%lx", atom);
+        snprintf (table->buf, XDBG_BUF_SIZE, "0x%x", (unsigned int)atom);
 
     xorg_list_add(&table->link, &evinfo->evatom.list);
     evinfo->evatom.size++;
@@ -592,7 +592,7 @@ char* xDbgGetRegion(XserverRegion region, EvlogInfo *evinfo, char *reply, int *l
 
         table->xid = region;
 
-        snprintf (table->buf, XDBG_BUF_SIZE, "0x%lx", region);
+        snprintf (table->buf, XDBG_BUF_SIZE, "0x%x", (unsigned int)region);
         xorg_list_add(&table->link, &evinfo->evregion.list);
         evinfo->evregion.size++;
     }
index 0f887d3..818e4a7 100644 (file)
@@ -68,8 +68,8 @@ _EvlogRequestComposite(EvlogInfo *evinfo, int detail_level, char *reply, int *le
     case X_CompositeRedirectWindow:
         {
             xCompositeRedirectWindowReq *stuff = (xCompositeRedirectWindowReq *)req;
-            REPLY (": XID(0x%lx)",
-                stuff->window);
+            REPLY (": XID(0x%x)",
+                (unsigned int)stuff->window);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -83,8 +83,8 @@ _EvlogRequestComposite(EvlogInfo *evinfo, int detail_level, char *reply, int *le
     case X_CompositeRedirectSubwindows:
         {
             xCompositeRedirectSubwindowsReq *stuff = (xCompositeRedirectSubwindowsReq *)req;
-            REPLY (": XID(0x%lx)",
-                stuff->window);
+            REPLY (": XID(0x%x)",
+                (unsigned int)stuff->window);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -98,8 +98,8 @@ _EvlogRequestComposite(EvlogInfo *evinfo, int detail_level, char *reply, int *le
     case X_CompositeUnredirectWindow:
         {
             xCompositeUnredirectWindowReq *stuff = (xCompositeUnredirectWindowReq *)req;
-            REPLY (": XID(0x%lx)",
-                stuff->window);
+            REPLY (": XID(0x%x)",
+                (unsigned int)stuff->window);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -113,8 +113,8 @@ _EvlogRequestComposite(EvlogInfo *evinfo, int detail_level, char *reply, int *le
     case X_CompositeUnredirectSubwindows:
         {
             xCompositeUnredirectSubwindowsReq *stuff = (xCompositeUnredirectSubwindowsReq *)req;
-            REPLY (": XID(0x%lx)",
-                stuff->window);
+            REPLY (": XID(0x%x)",
+                (unsigned int)stuff->window);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -128,9 +128,9 @@ _EvlogRequestComposite(EvlogInfo *evinfo, int detail_level, char *reply, int *le
     case X_CompositeNameWindowPixmap:
         {
             xCompositeNameWindowPixmapReq *stuff = (xCompositeNameWindowPixmapReq *)req;
-            REPLY (": XID(0x%lx) Pixmap(0x%lx)",
-                stuff->window,
-                stuff->pixmap);
+            REPLY (": XID(0x%x) Pixmap(0x%x)",
+                (unsigned int)stuff->window,
+                (unsigned int)stuff->pixmap);
 
             return reply;
         }
index a388ebd..36852ab 100644 (file)
@@ -227,9 +227,9 @@ char * xDbgEvlogRequestCore (EvlogInfo *evinfo, int detail_level, char *reply, i
         {
             xCreateWindowReq *stuff = (xCreateWindowReq *)req;
 
-            REPLY (": Window(0x%lx) Parent(0x%lx) size(%dx%d) boaderWid(%d) coordinate(%d,%d)",
-                stuff->wid,
-                stuff->parent,
+            REPLY (": Window(0x%x) Parent(0x%x) size(%dx%d) boaderWid(%d) coordinate(%d,%d)",
+                (unsigned int)stuff->wid,
+                (unsigned int)stuff->parent,
                 stuff->width,
                 stuff->height,
                 stuff->borderWidth,
@@ -244,7 +244,7 @@ char * xDbgEvlogRequestCore (EvlogInfo *evinfo, int detail_level, char *reply, i
                 switch (stuff->visual)
                 {
                     case CopyFromParent:  visual = "CopyFromParent"; break;
-                    default:  visual = dvisual; sprintf (dvisual, "0x%lx", stuff->visual); break;
+                    default:  visual = dvisual; sprintf (dvisual, "0x%x", (unsigned int)stuff->visual); break;
                 }
 
                 switch (stuff->class)
@@ -274,8 +274,8 @@ char * xDbgEvlogRequestCore (EvlogInfo *evinfo, int detail_level, char *reply, i
     case X_ChangeWindowAttributes:
         {
             xChangeWindowAttributesReq *stuff = (xChangeWindowAttributesReq *)req;
-            REPLY (": XID(0x%lx)",
-                stuff->window);
+            REPLY (": XID(0x%x)",
+                (unsigned int)stuff->window);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -292,8 +292,8 @@ char * xDbgEvlogRequestCore (EvlogInfo *evinfo, int detail_level, char *reply, i
         {
             xChangeSaveSetReq *stuff = (xChangeSaveSetReq *)req;
 
-            REPLY (": XID(0x%lx)",
-                stuff->window);
+            REPLY (": XID(0x%x)",
+                (unsigned int)stuff->window);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -317,9 +317,9 @@ char * xDbgEvlogRequestCore (EvlogInfo *evinfo, int detail_level, char *reply, i
     case X_ReparentWindow:
         {
             xReparentWindowReq *stuff = (xReparentWindowReq *)req;
-            REPLY (": Window(0x%lx) Parent(0x%lx) coord(%d,%d)",
-                stuff->window,
-                stuff->parent,
+            REPLY (": Window(0x%x) Parent(0x%x) coord(%d,%d)",
+                (unsigned int)stuff->window,
+                (unsigned int)stuff->parent,
                 stuff->x,
                 stuff->y);
 
@@ -329,8 +329,8 @@ char * xDbgEvlogRequestCore (EvlogInfo *evinfo, int detail_level, char *reply, i
     case X_ConfigureWindow:
         {
             xConfigureWindowReq *stuff = (xConfigureWindowReq *)req;
-            REPLY (": XID(0x%lx)",
-                stuff->window);
+            REPLY (": XID(0x%x)",
+                (unsigned int)stuff->window);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -347,8 +347,8 @@ char * xDbgEvlogRequestCore (EvlogInfo *evinfo, int detail_level, char *reply, i
         {
             xCirculateWindowReq *stuff = (xCirculateWindowReq *)req;
 
-            REPLY (": XID(0x%lx)",
-                stuff->window);
+            REPLY (": XID(0x%x)",
+                (unsigned int)stuff->window);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -373,8 +373,8 @@ char * xDbgEvlogRequestCore (EvlogInfo *evinfo, int detail_level, char *reply, i
         {
             xChangePropertyReq *stuff = (xChangePropertyReq *)req;
 
-            REPLY (": XID(0x%lx)",
-                stuff->window);
+            REPLY (": XID(0x%x)",
+                (unsigned int)stuff->window);
 
             REPLY (" Property");
             reply = xDbgGetAtom(stuff->property, evinfo, reply, len);
@@ -409,8 +409,8 @@ char * xDbgEvlogRequestCore (EvlogInfo *evinfo, int detail_level, char *reply, i
     case X_DeleteProperty:
         {
             xDeletePropertyReq *stuff = (xDeletePropertyReq *)req;
-            REPLY (": XID(0x%lx)",
-                stuff->window);
+            REPLY (": XID(0x%x)",
+                (unsigned int)stuff->window);
 
             REPLY (" Property");
             reply = xDbgGetAtom(stuff->property, evinfo, reply, len);
@@ -422,8 +422,8 @@ char * xDbgEvlogRequestCore (EvlogInfo *evinfo, int detail_level, char *reply, i
         {
             xGetPropertyReq *stuff = (xGetPropertyReq *)req;
 
-            REPLY (": XID(0x%lx)",
-                stuff->window);
+            REPLY (": XID(0x%x)",
+                (unsigned int)stuff->window);
 
             REPLY (" Property");
             reply = xDbgGetAtom(stuff->property, evinfo, reply, len);
@@ -446,8 +446,8 @@ char * xDbgEvlogRequestCore (EvlogInfo *evinfo, int detail_level, char *reply, i
     case X_SetSelectionOwner:
         {
             xSetSelectionOwnerReq *stuff = (xSetSelectionOwnerReq *)req;
-            REPLY (": XID(0x%lx)",
-                stuff->window);
+            REPLY (": XID(0x%x)",
+                (unsigned int)stuff->window);
 
             REPLY (" Selection");
             reply = xDbgGetAtom(stuff->selection, evinfo, reply, len);
@@ -464,8 +464,8 @@ char * xDbgEvlogRequestCore (EvlogInfo *evinfo, int detail_level, char *reply, i
     case X_ConvertSelection:
         {
             xConvertSelectionReq *stuff = (xConvertSelectionReq *)req;
-            REPLY (": XID(0x%lx)",
-                stuff->requestor);
+            REPLY (": XID(0x%x)",
+                (unsigned int)stuff->requestor);
 
             REPLY (" Selection");
             reply = xDbgGetAtom(stuff->selection, evinfo, reply, len);
@@ -486,8 +486,8 @@ char * xDbgEvlogRequestCore (EvlogInfo *evinfo, int detail_level, char *reply, i
     case X_SendEvent:
         {
             xSendEventReq *stuff = (xSendEventReq *)req;
-            REPLY (": XID(0x%lx)",
-                stuff->destination);
+            REPLY (": XID(0x%x)",
+                (unsigned int)stuff->destination);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -507,10 +507,10 @@ char * xDbgEvlogRequestCore (EvlogInfo *evinfo, int detail_level, char *reply, i
         {
             xGrabPointerReq *stuff = (xGrabPointerReq *)req;
 
-            REPLY (": XID(0x%lx) ConfineTo(0x%lx) Cursor(0x%lx)",
-                stuff->grabWindow,
-                stuff->confineTo,
-                stuff->cursor);
+            REPLY (": XID(0x%x) ConfineTo(0x%x) Cursor(0x%x)",
+                (unsigned int)stuff->grabWindow,
+                (unsigned int)stuff->confineTo,
+                (unsigned int)stuff->cursor);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -549,10 +549,10 @@ char * xDbgEvlogRequestCore (EvlogInfo *evinfo, int detail_level, char *reply, i
         {
             xGrabButtonReq *stuff = (xGrabButtonReq *)req;
 
-            REPLY (": XID(0x%lx) ConfineTo(0x%lx) Cursor(0x%lx)",
-                stuff->grabWindow,
-                stuff->confineTo,
-                stuff->cursor);
+            REPLY (": XID(0x%x) ConfineTo(0x%x) Cursor(0x%x)",
+                (unsigned int)stuff->grabWindow,
+                (unsigned int)stuff->confineTo,
+                (unsigned int)stuff->cursor);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -603,8 +603,8 @@ char * xDbgEvlogRequestCore (EvlogInfo *evinfo, int detail_level, char *reply, i
     case X_UngrabButton:
         {
             xUngrabButtonReq *stuff = (xUngrabButtonReq *)req;
-            REPLY (": XID(0x%lx)",
-                stuff->grabWindow);
+            REPLY (": XID(0x%x)",
+                (unsigned int)stuff->grabWindow);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -620,8 +620,8 @@ char * xDbgEvlogRequestCore (EvlogInfo *evinfo, int detail_level, char *reply, i
     case X_ChangeActivePointerGrab:
         {
             xChangeActivePointerGrabReq *stuff = (xChangeActivePointerGrabReq *)req;
-            REPLY (": Cursor(0x%lx)",
-                stuff->cursor);
+            REPLY (": Cursor(0x%x)",
+                (unsigned int)stuff->cursor);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -641,8 +641,8 @@ char * xDbgEvlogRequestCore (EvlogInfo *evinfo, int detail_level, char *reply, i
         {
             xGrabKeyboardReq *stuff = (xGrabKeyboardReq *)req;
 
-            REPLY (": XID(0x%lx)",
-                stuff->grabWindow);
+            REPLY (": XID(0x%x)",
+                (unsigned int)stuff->grabWindow);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -676,8 +676,8 @@ char * xDbgEvlogRequestCore (EvlogInfo *evinfo, int detail_level, char *reply, i
         {
             xGrabKeyReq *stuff = (xGrabKeyReq *)req;
 
-            REPLY (": XID(0x%lx)",
-                stuff->grabWindow);
+            REPLY (": XID(0x%x)",
+                (unsigned int)stuff->grabWindow);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -715,8 +715,8 @@ char * xDbgEvlogRequestCore (EvlogInfo *evinfo, int detail_level, char *reply, i
     case X_UngrabKey:
         {
             xUngrabKeyReq *stuff = (xUngrabKeyReq *)req;
-            REPLY (": XID(0x%lx)",
-                stuff->grabWindow);
+            REPLY (": XID(0x%x)",
+                (unsigned int)stuff->grabWindow);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -735,8 +735,8 @@ char * xDbgEvlogRequestCore (EvlogInfo *evinfo, int detail_level, char *reply, i
     case X_SetInputFocus:
         {
             xSetInputFocusReq *stuff = (xSetInputFocusReq *)req;
-            REPLY (": XID(0x%lx)",
-                stuff->focus);
+            REPLY (": XID(0x%x)",
+                (unsigned int)stuff->focus);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -751,9 +751,9 @@ char * xDbgEvlogRequestCore (EvlogInfo *evinfo, int detail_level, char *reply, i
     case X_CreatePixmap:
         {
             xCreatePixmapReq *stuff = (xCreatePixmapReq *)req;
-            REPLY (": Pixmap(0x%lx) Drawable(0x%lx) size(%dx%d)",
-                stuff->pid,
-                stuff->drawable,
+            REPLY (": Pixmap(0x%x) Drawable(0x%x) size(%dx%d)",
+                (unsigned int)stuff->pid,
+                (unsigned int)stuff->drawable,
                 stuff->width,
                 stuff->height);
 
@@ -769,8 +769,8 @@ char * xDbgEvlogRequestCore (EvlogInfo *evinfo, int detail_level, char *reply, i
     case X_ClearArea:
         {
             xClearAreaReq *stuff = (xClearAreaReq *)req;
-            REPLY (": XID(0x%lx) area(%d,%d %dx%d)",
-                stuff->window,
+            REPLY (": XID(0x%x) area(%d,%d %dx%d)",
+                (unsigned int)stuff->window,
                 stuff->x,
                 stuff->y,
                 stuff->width,
@@ -788,10 +788,10 @@ char * xDbgEvlogRequestCore (EvlogInfo *evinfo, int detail_level, char *reply, i
     case X_CopyArea:
         {
             xCopyAreaReq *stuff = (xCopyAreaReq *)req;
-            REPLY (": srcXID(0x%lx) dstXID(0x%lx) gc(0x%lx) size(%dx%d) src(%d,%d) dst(%d,%d)",
-                stuff->srcDrawable,
-                stuff->dstDrawable,
-                stuff->gc,
+            REPLY (": srcXID(0x%x) dstXID(0x%x) gc(0x%x) size(%dx%d) src(%d,%d) dst(%d,%d)",
+                (unsigned int)stuff->srcDrawable,
+                (unsigned int)stuff->dstDrawable,
+                (unsigned int)stuff->gc,
                 stuff->width,
                 stuff->height,
                 stuff->srcX,
@@ -805,10 +805,10 @@ char * xDbgEvlogRequestCore (EvlogInfo *evinfo, int detail_level, char *reply, i
     case X_CopyPlane:
         {
             xCopyPlaneReq *stuff = (xCopyPlaneReq *)req;
-            REPLY (": srcXID(0x%lx) dstXID(0x%lx) gc(0x%lx) size(%dx%d) src(%d,%d) dst(%d,%d)",
-                stuff->srcDrawable,
-                stuff->dstDrawable,
-                stuff->gc,
+            REPLY (": srcXID(0x%x) dstXID(0x%x) gc(0x%x) size(%dx%d) src(%d,%d) dst(%d,%d)",
+                (unsigned int)stuff->srcDrawable,
+                (unsigned int)stuff->dstDrawable,
+                (unsigned int)stuff->gc,
                 stuff->width,
                 stuff->height,
                 stuff->srcX,
@@ -818,8 +818,8 @@ char * xDbgEvlogRequestCore (EvlogInfo *evinfo, int detail_level, char *reply, i
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
-                REPLY (" bit_plane(0x%lx)",
-                    stuff->bitPlane);
+                REPLY (" bit_plane(0x%x)",
+                    (unsigned int)stuff->bitPlane);
             }
 
             return reply;
@@ -828,9 +828,9 @@ char * xDbgEvlogRequestCore (EvlogInfo *evinfo, int detail_level, char *reply, i
     case X_PolyPoint:
         {
             xPolyPointReq *stuff = (xPolyPointReq *)req;
-            REPLY (": XID(0x%lx) gc(0x%lx)",
-                stuff->drawable,
-                stuff->gc);
+            REPLY (": XID(0x%x) gc(0x%x)",
+                (unsigned int)stuff->drawable,
+                (unsigned int)stuff->gc);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -854,9 +854,9 @@ char * xDbgEvlogRequestCore (EvlogInfo *evinfo, int detail_level, char *reply, i
     case X_PolyLine:
         {
             xPolyLineReq *stuff = (xPolyLineReq *)req;
-            REPLY (": XID(0x%lx gc(0x%lx)",
-                stuff->drawable,
-                stuff->gc);
+            REPLY (": XID(0x%x gc(0x%x)",
+                (unsigned int)stuff->drawable,
+                (unsigned int)stuff->gc);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -880,9 +880,9 @@ char * xDbgEvlogRequestCore (EvlogInfo *evinfo, int detail_level, char *reply, i
     case X_PolySegment:
         {
             xPolySegmentReq *stuff = (xPolySegmentReq *)req;
-            REPLY (": XID(0x%lx) gc(0x%lx)",
-                stuff->drawable,
-                stuff->gc);
+            REPLY (": XID(0x%x) gc(0x%x)",
+                (unsigned int)stuff->drawable,
+                (unsigned int)stuff->gc);
 
             return reply;
         }
@@ -890,9 +890,9 @@ char * xDbgEvlogRequestCore (EvlogInfo *evinfo, int detail_level, char *reply, i
     case X_PolyRectangle:
         {
             xPolyRectangleReq *stuff = (xPolyRectangleReq *)req;
-            REPLY (": XID(0x%lx) gc(0x%lx)",
-                stuff->drawable,
-                stuff->gc);
+            REPLY (": XID(0x%x) gc(0x%x)",
+                (unsigned int)stuff->drawable,
+                (unsigned int)stuff->gc);
 
             return reply;
         }
@@ -900,9 +900,9 @@ char * xDbgEvlogRequestCore (EvlogInfo *evinfo, int detail_level, char *reply, i
     case X_PolyArc:
         {
             xPolyArcReq *stuff = (xPolyArcReq *)req;
-            REPLY (": XID(0x%lx) gc(0x%lx)",
-                stuff->drawable,
-                stuff->gc);
+            REPLY (": XID(0x%x) gc(0x%x)",
+                (unsigned int)stuff->drawable,
+                (unsigned int)stuff->gc);
 
             return reply;
         }
@@ -910,9 +910,9 @@ char * xDbgEvlogRequestCore (EvlogInfo *evinfo, int detail_level, char *reply, i
     case X_FillPoly:
         {
             xFillPolyReq *stuff = (xFillPolyReq *)req;
-            REPLY (": XID(0x%lx) gc(0x%lx)",
-                stuff->drawable,
-                stuff->gc);
+            REPLY (": XID(0x%x) gc(0x%x)",
+                (unsigned int)stuff->drawable,
+                (unsigned int)stuff->gc);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -945,9 +945,9 @@ char * xDbgEvlogRequestCore (EvlogInfo *evinfo, int detail_level, char *reply, i
     case X_PolyFillRectangle:
         {
             xPolyFillRectangleReq *stuff = (xPolyFillRectangleReq *)req;
-            REPLY (": XID(0x%lx) gc(0x%lx)",
-                stuff->drawable,
-                stuff->gc);
+            REPLY (": XID(0x%x) gc(0x%x)",
+                (unsigned int)stuff->drawable,
+                (unsigned int)stuff->gc);
 
             return reply;
         }
@@ -955,9 +955,9 @@ char * xDbgEvlogRequestCore (EvlogInfo *evinfo, int detail_level, char *reply, i
     case X_PolyFillArc:
         {
             xPolyFillArcReq *stuff = (xPolyFillArcReq *)req;
-            REPLY (": XID(0x%lx) gc(0x%lx)",
-                stuff->drawable,
-                stuff->gc);
+            REPLY (": XID(0x%x) gc(0x%x)",
+                (unsigned int)stuff->drawable,
+                (unsigned int)stuff->gc);
 
             return reply;
         }
@@ -965,9 +965,9 @@ char * xDbgEvlogRequestCore (EvlogInfo *evinfo, int detail_level, char *reply, i
     case X_PutImage:
         {
             xPutImageReq *stuff = (xPutImageReq *)req;
-            REPLY (": XID(0x%lx) gc(0x%lx) size(%dx%d) dst(%d,%d)",
-                stuff->drawable,
-                stuff->gc,
+            REPLY (": XID(0x%x) gc(0x%x) size(%dx%d) dst(%d,%d)",
+                (unsigned int)stuff->drawable,
+                (unsigned int)stuff->gc,
                 stuff->width,
                 stuff->height,
                 stuff->dstX,
@@ -997,8 +997,8 @@ char * xDbgEvlogRequestCore (EvlogInfo *evinfo, int detail_level, char *reply, i
     case X_GetImage:
         {
             xGetImageReq *stuff = (xGetImageReq *)req;
-            REPLY (": XID(0x%lx) size(%dx%d) dst(%d,%d)",
-                stuff->drawable,
+            REPLY (": XID(0x%x) size(%dx%d) dst(%d,%d)",
+                (unsigned int)stuff->drawable,
                 stuff->width,
                 stuff->height,
                 stuff->x,
@@ -1017,9 +1017,9 @@ char * xDbgEvlogRequestCore (EvlogInfo *evinfo, int detail_level, char *reply, i
                     default:  format = dformat; sprintf (dformat, "%d", stuff->format); break;
                 }
 
-                REPLY (" format(%s) plane_mask(0x%lx)",
+                REPLY (" format(%s) plane_mask(0x%x)",
                     format,
-                    stuff->planeMask);
+                    (unsigned int)stuff->planeMask);
             }
 
             return reply;
@@ -1028,9 +1028,9 @@ char * xDbgEvlogRequestCore (EvlogInfo *evinfo, int detail_level, char *reply, i
     case X_PolyText8:
         {
             xPolyText8Req *stuff = (xPolyText8Req *)req;
-            REPLY (": XID(0x%lx) gc(0x%lx) coord(%d,%d)",
-                stuff->drawable,
-                stuff->gc,
+            REPLY (": XID(0x%x) gc(0x%x) coord(%d,%d)",
+                (unsigned int)stuff->drawable,
+                (unsigned int)stuff->gc,
                 stuff->x,
                 stuff->y);
 
@@ -1040,9 +1040,9 @@ char * xDbgEvlogRequestCore (EvlogInfo *evinfo, int detail_level, char *reply, i
     case X_PolyText16:
         {
             xPolyText16Req *stuff = (xPolyText16Req *)req;
-            REPLY (": XID(0x%lx) gc(0x%lx) coord(%d,%d)",
-                stuff->drawable,
-                stuff->gc,
+            REPLY (": XID(0x%x) gc(0x%x) coord(%d,%d)",
+                (unsigned int)stuff->drawable,
+                (unsigned int)stuff->gc,
                 stuff->x,
                 stuff->y);
 
@@ -1052,9 +1052,9 @@ char * xDbgEvlogRequestCore (EvlogInfo *evinfo, int detail_level, char *reply, i
     case X_ImageText8:
         {
             xImageText8Req *stuff = (xImageText8Req *)req;
-            REPLY (": XID(0x%lx) gc(0x%lx) coord(%d,%d)",
-                stuff->drawable,
-                stuff->gc,
+            REPLY (": XID(0x%x) gc(0x%x) coord(%d,%d)",
+                (unsigned int)stuff->drawable,
+                (unsigned int)stuff->gc,
                 stuff->x,
                 stuff->y);
 
@@ -1070,9 +1070,9 @@ char * xDbgEvlogRequestCore (EvlogInfo *evinfo, int detail_level, char *reply, i
     case X_ImageText16:
         {
             xImageText16Req *stuff = (xImageText16Req *)req;
-            REPLY (": XID(0x%lx) gc(0x%lx) coord(%d,%d)",
-                stuff->drawable,
-                stuff->gc,
+            REPLY (": XID(0x%x) gc(0x%x) coord(%d,%d)",
+                (unsigned int)stuff->drawable,
+                (unsigned int)stuff->gc,
                 stuff->x,
                 stuff->y);
 
@@ -1171,8 +1171,8 @@ char * xDbgEvlogRequestCore (EvlogInfo *evinfo, int detail_level, char *reply, i
     case X_KillClient:
         {
             xResourceReq *stuff = (xResourceReq *)req;
-            REPLY (": XID(0x%lx)",
-                stuff->id);
+            REPLY (": XID(0x%x)",
+                (unsigned int)stuff->id);
 
             return reply;
         }
@@ -1196,14 +1196,14 @@ char * xDbgEvlogEventCore (EvlogInfo *evinfo, int detail_level, char *reply, int
     case ButtonRelease:
     case MotionNotify:
         {
-            REPLY (": Root(0x%lx %d,%d) Event(0x%lx %d,%d) Child(0x%lx)",
-                evt->u.keyButtonPointer.root,
+            REPLY (": Root(0x%x %d,%d) Event(0x%x %d,%d) Child(0x%x)",
+                (unsigned int)evt->u.keyButtonPointer.root,
                 evt->u.keyButtonPointer.rootX,
                 evt->u.keyButtonPointer.rootY,
-                evt->u.keyButtonPointer.event,
+                (unsigned int)evt->u.keyButtonPointer.event,
                 evt->u.keyButtonPointer.eventX,
                 evt->u.keyButtonPointer.eventY,
-                evt->u.keyButtonPointer.child);
+                (unsigned int)evt->u.keyButtonPointer.child);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -1220,14 +1220,14 @@ char * xDbgEvlogEventCore (EvlogInfo *evinfo, int detail_level, char *reply, int
     case EnterNotify:
     case LeaveNotify:
         {
-            REPLY (": Root(0x%lx %d,%d) Event(0x%lx %d,%d) Child(0x%lx)",
-                evt->u.enterLeave.root,
+            REPLY (": Root(0x%x %d,%d) Event(0x%x %d,%d) Child(0x%x)",
+                (unsigned int)evt->u.enterLeave.root,
                 evt->u.enterLeave.rootX,
                 evt->u.enterLeave.rootY,
-                evt->u.enterLeave.event,
+                (unsigned int)evt->u.enterLeave.event,
                 evt->u.enterLeave.eventX,
                 evt->u.enterLeave.eventY,
-                evt->u.enterLeave.child);
+                (unsigned int)evt->u.enterLeave.child);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -1247,8 +1247,8 @@ char * xDbgEvlogEventCore (EvlogInfo *evinfo, int detail_level, char *reply, int
     case FocusOut:
     case KeymapNotify:
         {
-            REPLY (": XID(0x%lx)",
-                evt->u.focus.window);
+            REPLY (": XID(0x%x)",
+                (unsigned int)evt->u.focus.window);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -1273,8 +1273,8 @@ char * xDbgEvlogEventCore (EvlogInfo *evinfo, int detail_level, char *reply, int
 
     case Expose:
         {
-            REPLY (": XID(0x%lx) size(%dx%d) coord(%d,%d)",
-                evt->u.expose.window,
+            REPLY (": XID(0x%x) size(%dx%d) coord(%d,%d)",
+                (unsigned int)evt->u.expose.window,
                 evt->u.expose.width,
                 evt->u.expose.height,
                 evt->u.expose.x,
@@ -1291,8 +1291,8 @@ char * xDbgEvlogEventCore (EvlogInfo *evinfo, int detail_level, char *reply, int
 
     case GraphicsExpose:
         {
-            REPLY (": XID(0x%lx) size(%dx%d) coord(%d,%d)",
-                evt->u.graphicsExposure.drawable,
+            REPLY (": XID(0x%x) size(%dx%d) coord(%d,%d)",
+                (unsigned int)evt->u.graphicsExposure.drawable,
                 evt->u.graphicsExposure.width,
                 evt->u.graphicsExposure.height,
                 evt->u.graphicsExposure.x,
@@ -1321,8 +1321,8 @@ char * xDbgEvlogEventCore (EvlogInfo *evinfo, int detail_level, char *reply, int
 
     case NoExpose:
         {
-            REPLY (": XID(0x%lx)",
-                evt->u.noExposure.drawable);
+            REPLY (": XID(0x%x)",
+                (unsigned int)evt->u.noExposure.drawable);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -1346,8 +1346,8 @@ char * xDbgEvlogEventCore (EvlogInfo *evinfo, int detail_level, char *reply, int
 
     case VisibilityNotify:
         {
-            REPLY (": XID(0x%lx)",
-                evt->u.visibility.window);
+            REPLY (": XID(0x%x)",
+                (unsigned int)evt->u.visibility.window);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -1371,9 +1371,9 @@ char * xDbgEvlogEventCore (EvlogInfo *evinfo, int detail_level, char *reply, int
 
     case CreateNotify:
         {
-            REPLY (": Window(0x%lx) Parent(0x%lx) size(%dx%d) coord(%d,%d) borderWidth(%d)",
-                evt->u.createNotify.window,
-                evt->u.createNotify.parent,
+            REPLY (": Window(0x%x) Parent(0x%x) size(%dx%d) coord(%d,%d) borderWidth(%d)",
+                (unsigned int)evt->u.createNotify.window,
+                (unsigned int)evt->u.createNotify.parent,
                 evt->u.createNotify.width,
                 evt->u.createNotify.height,
                 evt->u.createNotify.x,
@@ -1391,18 +1391,18 @@ char * xDbgEvlogEventCore (EvlogInfo *evinfo, int detail_level, char *reply, int
 
     case DestroyNotify:
         {
-            REPLY (": Window(0x%lx) Event(0x%lx)",
-                evt->u.destroyNotify.window,
-                evt->u.destroyNotify.event);
+            REPLY (": Window(0x%x) Event(0x%x)",
+                (unsigned int)evt->u.destroyNotify.window,
+                (unsigned int)evt->u.destroyNotify.event);
 
             return reply;
                }
 
     case UnmapNotify:
         {
-            REPLY (": Window(0x%lx) Event(0x%lx)",
-                evt->u.unmapNotify.window,
-                evt->u.unmapNotify.event);
+            REPLY (": Window(0x%x) Event(0x%x)",
+                (unsigned int)evt->u.unmapNotify.window,
+                (unsigned int)evt->u.unmapNotify.event);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -1415,9 +1415,9 @@ char * xDbgEvlogEventCore (EvlogInfo *evinfo, int detail_level, char *reply, int
 
     case MapNotify:
         {
-            REPLY (": Window(0x%lx) Event(0x%lx)",
-                evt->u.mapNotify.window,
-                evt->u.mapNotify.event);
+            REPLY (": Window(0x%x) Event(0x%x)",
+                (unsigned int)evt->u.mapNotify.window,
+                (unsigned int)evt->u.mapNotify.event);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -1430,19 +1430,19 @@ char * xDbgEvlogEventCore (EvlogInfo *evinfo, int detail_level, char *reply, int
 
     case MapRequest:
         {
-            REPLY (": Window(0x%lx) Parent(0x%lx)",
-                evt->u.mapRequest.window,
-                evt->u.mapRequest.parent);
+            REPLY (": Window(0x%x) Parent(0x%x)",
+                (unsigned int)evt->u.mapRequest.window,
+                (unsigned int)evt->u.mapRequest.parent);
 
             return reply;
         }
 
     case ReparentNotify:
         {
-            REPLY (": Window(0x%lx) Event(0x%lx) Parent(0x%lx) coord(%d,%d)",
-                evt->u.reparent.window,
-                evt->u.reparent.event,
-                evt->u.reparent.parent,
+            REPLY (": Window(0x%x) Event(0x%x) Parent(0x%x) coord(%d,%d)",
+                (unsigned int)evt->u.reparent.window,
+                (unsigned int)evt->u.reparent.event,
+                (unsigned int)evt->u.reparent.parent,
                 evt->u.reparent.x,
                 evt->u.reparent.y);
 
@@ -1457,10 +1457,10 @@ char * xDbgEvlogEventCore (EvlogInfo *evinfo, int detail_level, char *reply, int
 
     case ConfigureNotify:
         {
-            REPLY (": Window(0x%lx) Event(0x%lx) AboveSibling(0x%lx) size(%dx%d) coord(%d,%d) borderWidth(%d)",
-                evt->u.configureNotify.window,
-                evt->u.configureNotify.event,
-                evt->u.configureNotify.aboveSibling,
+            REPLY (": Window(0x%x) Event(0x%x) AboveSibling(0x%x) size(%dx%d) coord(%d,%d) borderWidth(%d)",
+                (unsigned int)evt->u.configureNotify.window,
+                (unsigned int)evt->u.configureNotify.event,
+                (unsigned int)evt->u.configureNotify.aboveSibling,
                 evt->u.configureNotify.width,
                 evt->u.configureNotify.height,
                 evt->u.configureNotify.x,
@@ -1478,10 +1478,10 @@ char * xDbgEvlogEventCore (EvlogInfo *evinfo, int detail_level, char *reply, int
 
     case ConfigureRequest:
         {
-            REPLY (": Window(0x%lx) Parent(0x%lx) Sibling(0x%lx) size(%dx%d) coord(%d,%d) borderWidth(%d)",
-                evt->u.configureRequest.window,
-                evt->u.configureRequest.parent,
-                evt->u.configureRequest.sibling,
+            REPLY (": Window(0x%x) Parent(0x%x) Sibling(0x%x) size(%dx%d) coord(%d,%d) borderWidth(%d)",
+                (unsigned int)evt->u.configureRequest.window,
+                (unsigned int)evt->u.configureRequest.parent,
+                (unsigned int)evt->u.configureRequest.sibling,
                 evt->u.configureRequest.width,
                 evt->u.configureRequest.height,
                 evt->u.configureRequest.x,
@@ -1503,9 +1503,9 @@ char * xDbgEvlogEventCore (EvlogInfo *evinfo, int detail_level, char *reply, int
 
     case GravityNotify:
         {
-            REPLY (": Window(0x%lx) Event(0x%lx) coord(%d,%d)",
-                evt->u.gravity.window,
-                evt->u.gravity.event,
+            REPLY (": Window(0x%x) Event(0x%x) coord(%d,%d)",
+                (unsigned int)evt->u.gravity.window,
+                (unsigned int)evt->u.gravity.event,
                 evt->u.gravity.x,
                 evt->u.gravity.y);
 
@@ -1514,8 +1514,8 @@ char * xDbgEvlogEventCore (EvlogInfo *evinfo, int detail_level, char *reply, int
 
     case ResizeRequest:
         {
-            REPLY (": Window(0x%lx) size(%dx%d)",
-                evt->u.resizeRequest.window,
+            REPLY (": Window(0x%x) size(%dx%d)",
+                (unsigned int)evt->u.resizeRequest.window,
                 evt->u.resizeRequest.width,
                 evt->u.resizeRequest.height);
 
@@ -1525,10 +1525,10 @@ char * xDbgEvlogEventCore (EvlogInfo *evinfo, int detail_level, char *reply, int
     case CirculateNotify:
     case CirculateRequest:
         {
-            REPLY (": Window(0x%lx) Event(0x%lx) parent(0x%lx)",
-                evt->u.circulate.window,
-                evt->u.circulate.event,
-                evt->u.circulate.parent);
+            REPLY (": Window(0x%x) Event(0x%x) parent(0x%x)",
+                (unsigned int)evt->u.circulate.window,
+                (unsigned int)evt->u.circulate.event,
+                (unsigned int)evt->u.circulate.parent);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -1551,8 +1551,8 @@ char * xDbgEvlogEventCore (EvlogInfo *evinfo, int detail_level, char *reply, int
 
     case PropertyNotify:
         {
-            REPLY (": Window(0x%lx)",
-                evt->u.property.window);
+            REPLY (": Window(0x%x)",
+                (unsigned int)evt->u.property.window);
 
             REPLY (" Property");
             reply = xDbgGetAtom(evt->u.property.atom, evinfo, reply, len);
@@ -1581,8 +1581,8 @@ char * xDbgEvlogEventCore (EvlogInfo *evinfo, int detail_level, char *reply, int
 
     case SelectionClear:
         {
-            REPLY (": Window(0x%lx)",
-                evt->u.selectionClear.window);
+            REPLY (": Window(0x%x)",
+                (unsigned int)evt->u.selectionClear.window);
 
             REPLY (" Atom");
             reply = xDbgGetAtom(evt->u.selectionClear.atom, evinfo, reply, len);
@@ -1598,9 +1598,9 @@ char * xDbgEvlogEventCore (EvlogInfo *evinfo, int detail_level, char *reply, int
 
     case SelectionRequest:
         {
-            REPLY (": Owner(0x%lx) Requestor(0x%lx)",
-                evt->u.selectionRequest.owner,
-                evt->u.selectionRequest.requestor);
+            REPLY (": Owner(0x%x) Requestor(0x%x)",
+                (unsigned int)evt->u.selectionRequest.owner,
+                (unsigned int)evt->u.selectionRequest.requestor);
 
             REPLY (" selection");
             reply = xDbgGetAtom(evt->u.selectionRequest.selection, evinfo, reply, len);
@@ -1620,8 +1620,8 @@ char * xDbgEvlogEventCore (EvlogInfo *evinfo, int detail_level, char *reply, int
 
     case SelectionNotify:
         {
-            REPLY (": Requestor(0x%lx)",
-                evt->u.selectionNotify.requestor);
+            REPLY (": Requestor(0x%x)",
+                (unsigned int)evt->u.selectionNotify.requestor);
 
             REPLY (" selection");
             reply = xDbgGetAtom(evt->u.selectionNotify.selection, evinfo, reply, len);
@@ -1641,9 +1641,9 @@ char * xDbgEvlogEventCore (EvlogInfo *evinfo, int detail_level, char *reply, int
 
     case ColormapNotify:
         {
-            REPLY (": XID(0x%lx) Colormap(0x%lx)",
-                evt->u.colormap.window,
-                evt->u.colormap.colormap);
+            REPLY (": XID(0x%x) Colormap(0x%x)",
+                (unsigned int)evt->u.colormap.window,
+                (unsigned int)evt->u.colormap.colormap);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -1667,8 +1667,8 @@ char * xDbgEvlogEventCore (EvlogInfo *evinfo, int detail_level, char *reply, int
 
     case ClientMessage:
         {
-            REPLY (": XID(0x%lx)",
-                evt->u.clientMessage.window);
+            REPLY (": XID(0x%x)",
+                (unsigned int)evt->u.clientMessage.window);
 
             REPLY (" Type");
             reply = xDbgGetAtom(evt->u.clientMessage.u.b.type, evinfo, reply, len);
@@ -1697,8 +1697,8 @@ char * xDbgEvlogReplyCore (EvlogInfo *evinfo, int detail_level, char *reply, int
             {
                 xGetGeometryReply *stuff = (xGetGeometryReply *)rep;
 
-                REPLY (": XID(0x%lx) coord(%d,%d %dx%d) borderWidth(%d)",
-                    stuff->root,
+                REPLY (": XID(0x%x) coord(%d,%d %dx%d) borderWidth(%d)",
+                    (unsigned int)stuff->root,
                     stuff->x,
                     stuff->y,
                     stuff->width,
@@ -1719,9 +1719,9 @@ char * xDbgEvlogReplyCore (EvlogInfo *evinfo, int detail_level, char *reply, int
             {
                 xQueryTreeReply *stuff = (xQueryTreeReply *)rep;
 
-                REPLY (": XID(0x%lx) Parent(0x%lx) ChildrenNum(%d)",
-                    stuff->root,
-                    stuff->parent,
+                REPLY (": XID(0x%x) Parent(0x%x) ChildrenNum(%d)",
+                    (unsigned int)stuff->root,
+                    (unsigned int)stuff->parent,
                     stuff->nChildren);
             }
             else
@@ -1733,7 +1733,7 @@ char * xDbgEvlogReplyCore (EvlogInfo *evinfo, int detail_level, char *reply, int
                 REPLY ("(");
                 for (i = 0 ; i < evinfo->rep.size / sizeof(Window) ; i++)
                 {
-                    REPLY("0x%lx", stuff[i]);
+                    REPLY("0x%x", (unsigned int)stuff[i]);
                     if(i != evinfo->rep.size / sizeof(Window) - 1)
                         REPLY (", ");
                 }
@@ -1752,8 +1752,8 @@ char * xDbgEvlogReplyCore (EvlogInfo *evinfo, int detail_level, char *reply, int
                 REPLY (": PropertyType");
                 reply = xDbgGetAtom(stuff->propertyType, evinfo, reply, len);
 
-                REPLY (" bytesAfter(0x%lx) format(%d) ItemNum(%ld)",
-                    stuff->bytesAfter,
+                REPLY (" bytesAfter(0x%x) format(%d) ItemNum(%ld)",
+                    (unsigned int)stuff->bytesAfter,
                     stuff->format,
                     stuff->nItems);
             }
@@ -1799,8 +1799,8 @@ char * xDbgEvlogReplyCore (EvlogInfo *evinfo, int detail_level, char *reply, int
             {
                 xGetImageReply *stuff = (xGetImageReply *)rep;
 
-                REPLY (": XID(0x%lx)",
-                    stuff->visual);
+                REPLY (": XID(0x%x)",
+                    (unsigned int)stuff->visual);
             }
             else
             {
index 6d255ad..fbf3873 100644 (file)
@@ -69,9 +69,9 @@ _EvlogRequestDamage(EvlogInfo *evinfo, int detail_level, char *reply, int *len)
     case X_DamageCreate:
         {
             xDamageCreateReq *stuff = (xDamageCreateReq *)req;
-            REPLY (": XID(0x%lx) Drawable(0x%lx)",
-                stuff->damage,
-                stuff->drawable);
+            REPLY (": XID(0x%x) Drawable(0x%x)",
+                (unsigned int)stuff->damage,
+                (unsigned int)stuff->drawable);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -97,8 +97,8 @@ _EvlogRequestDamage(EvlogInfo *evinfo, int detail_level, char *reply, int *len)
     case X_DamageDestroy:
         {
             xDamageDestroyReq *stuff = (xDamageDestroyReq *)req;
-            REPLY (": XID(0x%lx)",
-                stuff->damage);
+            REPLY (": XID(0x%x)",
+                (unsigned int)stuff->damage);
 
             return reply;
         }
@@ -120,9 +120,9 @@ _EvlogEventDamage (EvlogInfo *evinfo, int first_base, int detail_level, char *re
     case XDamageNotify:
         {
             xDamageNotifyEvent *stuff = (xDamageNotifyEvent*)evt;
-            REPLY (": XID(0x%lx) Damage(0x%lx) area(%d,%d %dx%d) geo(%d,%d %dx%d)",
-                stuff->drawable,
-                stuff->damage,
+            REPLY (": XID(0x%x) Damage(0x%x) area(%d,%d %dx%d) geo(%d,%d %dx%d)",
+                (unsigned int)stuff->drawable,
+                (unsigned int)stuff->damage,
                 stuff->area.x,
                 stuff->area.y,
                 stuff->area.width,
index 68e5c96..aa230de 100644 (file)
@@ -69,8 +69,8 @@ _EvlogRequestDri2 (EvlogInfo *evinfo, int detail_level, char *reply, int *len)
     case X_DRI2CreateDrawable:
         {
             xDRI2CreateDrawableReq *stuff = (xDRI2CreateDrawableReq *)req;
-            REPLY (": XID(0x%lx)",
-                stuff->drawable);
+            REPLY (": XID(0x%x)",
+                (unsigned int)stuff->drawable);
 
             return reply;
         }
@@ -78,8 +78,8 @@ _EvlogRequestDri2 (EvlogInfo *evinfo, int detail_level, char *reply, int *len)
     case X_DRI2DestroyDrawable:
         {
             xDRI2DestroyDrawableReq *stuff = (xDRI2DestroyDrawableReq *)req;
-            REPLY (": XID(0x%lx)",
-                stuff->drawable);
+            REPLY (": XID(0x%x)",
+                (unsigned int)stuff->drawable);
 
             return reply;
         }
@@ -87,8 +87,8 @@ _EvlogRequestDri2 (EvlogInfo *evinfo, int detail_level, char *reply, int *len)
     case X_DRI2GetBuffers:
         {
             xDRI2GetBuffersReq *stuff = (xDRI2GetBuffersReq *)req;
-            REPLY (": XID(0x%lx)",
-                stuff->drawable);
+            REPLY (": XID(0x%x)",
+                (unsigned int)stuff->drawable);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -102,10 +102,10 @@ _EvlogRequestDri2 (EvlogInfo *evinfo, int detail_level, char *reply, int *len)
     case X_DRI2CopyRegion:
         {
             xDRI2CopyRegionReq *stuff = (xDRI2CopyRegionReq *)req;
-            REPLY (": XID(0x%lx) src(0x%lx) dst(0x%lx)",
-                stuff->drawable,
-                stuff->src,
-                stuff->dest);
+            REPLY (": XID(0x%x) src(0x%x) dst(0x%x)",
+                (unsigned int)stuff->drawable,
+                (unsigned int)stuff->src,
+                (unsigned int)stuff->dest);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -119,8 +119,8 @@ _EvlogRequestDri2 (EvlogInfo *evinfo, int detail_level, char *reply, int *len)
     case X_DRI2GetBuffersWithFormat:
         {
             xDRI2GetBuffersReq *stuff = (xDRI2GetBuffersReq *)req;
-            REPLY (": XID(0x%lx)",
-                stuff->drawable);
+            REPLY (": XID(0x%x)",
+                (unsigned int)stuff->drawable);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -135,14 +135,14 @@ _EvlogRequestDri2 (EvlogInfo *evinfo, int detail_level, char *reply, int *len)
     case X_DRI2SwapBuffers:
         {
             xDRI2SwapBuffersReq *stuff = (xDRI2SwapBuffersReq *)req;
-            REPLY (": XID(0x%lx) msc(0x%lx/0x%lx) divisor(0x%lx/0x%lx) remainder(0x%lx/0x%lx)",
-                stuff->drawable,
-                stuff->target_msc_hi,
-                stuff->target_msc_lo,
-                stuff->divisor_hi,
-                stuff->divisor_lo,
-                stuff->remainder_hi,
-                stuff->remainder_lo);
+            REPLY (": XID(0x%x) msc(0x%x/0x%x) divisor(0x%x/0x%x) remainder(0x%x/0x%x)",
+                (unsigned int)stuff->drawable,
+                (unsigned int)stuff->target_msc_hi,
+                (unsigned int)stuff->target_msc_lo,
+                (unsigned int)stuff->divisor_hi,
+                (unsigned int)stuff->divisor_lo,
+                (unsigned int)stuff->remainder_hi,
+                (unsigned int)stuff->remainder_lo);
 
             return reply;
         }
@@ -150,8 +150,8 @@ _EvlogRequestDri2 (EvlogInfo *evinfo, int detail_level, char *reply, int *len)
     case X_DRI2SwapInterval:
         {
             xDRI2SwapIntervalReq *stuff = (xDRI2SwapIntervalReq *)req;
-            REPLY (": XID(0x%lx)",
-                stuff->drawable);
+            REPLY (": XID(0x%x)",
+                (unsigned int)stuff->drawable);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -165,8 +165,8 @@ _EvlogRequestDri2 (EvlogInfo *evinfo, int detail_level, char *reply, int *len)
     case X_DRI2SwapBuffersWithRegion:
         {
             xDRI2SwapBuffersWithRegionReq *stuff = (xDRI2SwapBuffersWithRegionReq *)req;
-            REPLY (": XID(0x%lx)",
-                stuff->drawable);
+            REPLY (": XID(0x%x)",
+                (unsigned int)stuff->drawable);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -195,14 +195,14 @@ _EvlogEventDri2 (EvlogInfo *evinfo, int first_base, int detail_level, char *repl
     case DRI2_BufferSwapComplete:
         {
             xDRI2BufferSwapComplete *stuff = (xDRI2BufferSwapComplete *) evt;
-            REPLY (": XID(0x%lx) ust(0x%lx/0x%lx) msc(0x%lx/0x%lx) sbc(0x%lx/0x%lx)",
-                stuff->drawable,
-                stuff->ust_hi,
-                stuff->ust_lo,
-                stuff->msc_hi,
-                stuff->msc_lo,
-                stuff->sbc_hi,
-                stuff->sbc_lo);
+            REPLY (": XID(0x%x) ust(0x%x/0x%x) msc(0x%x/0x%x) sbc(0x%x/0x%x)",
+                (unsigned int)stuff->drawable,
+                (unsigned int)stuff->ust_hi,
+                (unsigned int)stuff->ust_lo,
+                (unsigned int)stuff->msc_hi,
+                (unsigned int)stuff->msc_lo,
+                (unsigned int)stuff->sbc_hi,
+                (unsigned int)stuff->sbc_lo);
 
             evinfo->evt.size = sizeof (xDRI2BufferSwapComplete);
 
@@ -221,8 +221,8 @@ _EvlogEventDri2 (EvlogInfo *evinfo, int first_base, int detail_level, char *repl
     case DRI2_InvalidateBuffers:
         {
             xDRI2InvalidateBuffers *stuff = (xDRI2InvalidateBuffers *) evt;
-            REPLY (": XID(0x%lx)",
-                stuff->drawable);
+            REPLY (": XID(0x%x)",
+                (unsigned int)stuff->drawable);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -267,12 +267,12 @@ _EvlogReplyDri2 (EvlogInfo *evinfo, int detail_level, char *reply, int *len)
             {
                 xDRI2Buffer *stuff = (xDRI2Buffer *)rep;
 
-                REPLY ("attachment(0x%lx) Name(0x%lx) pitch(0x%lx) cpp(0x%lx) flags(0x%lx)",
-                    stuff->attachment,
-                    stuff->name,
-                    stuff->pitch,
-                    stuff->cpp,
-                    stuff->flags);
+                REPLY ("attachment(0x%x) Name(0x%x) pitch(0x%x) cpp(0x%x) flags(0x%x)",
+                    (unsigned int)stuff->attachment,
+                    (unsigned int)stuff->name,
+                    (unsigned int)stuff->pitch,
+                    (unsigned int)stuff->cpp,
+                    (unsigned int)stuff->flags);
             }
 
             return reply;
index 79ddf63..a74b199 100644 (file)
@@ -69,13 +69,13 @@ _EvlogRequestGesture(EvlogInfo *evinfo, int detail_level, char *reply, int *len)
     case X_GestureSelectEvents:
         {
             xGestureSelectEventsReq *stuff = (xGestureSelectEventsReq *)req;
-            REPLY (": XID(0x%lx)",
-                stuff->window);
+            REPLY (": XID(0x%x)",
+                (unsigned int)stuff->window);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
-                REPLY (" mask(0x%lx)",
-                    stuff->mask);
+                REPLY (" mask(0x%x)",
+                    (unsigned int)stuff->mask);
             }
 
             return reply;
@@ -84,8 +84,8 @@ _EvlogRequestGesture(EvlogInfo *evinfo, int detail_level, char *reply, int *len)
     case X_GestureGetSelectedEvents:
         {
             xGestureGetSelectedEventsReq *stuff = (xGestureGetSelectedEventsReq *)req;
-            REPLY (": XID(0x%lx)",
-                stuff->window);
+            REPLY (": XID(0x%x)",
+                (unsigned int)stuff->window);
 
             return reply;
         }
@@ -93,8 +93,8 @@ _EvlogRequestGesture(EvlogInfo *evinfo, int detail_level, char *reply, int *len)
     case X_GestureGrabEvent:
         {
             xGestureGrabEventReq *stuff = (xGestureGrabEventReq *)req;
-            REPLY (": XID(0x%lx)",
-                stuff->window);
+            REPLY (": XID(0x%x)",
+                (unsigned int)stuff->window);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -125,8 +125,8 @@ _EvlogRequestGesture(EvlogInfo *evinfo, int detail_level, char *reply, int *len)
     case X_GestureUngrabEvent:
         {
             xGestureUngrabEventReq *stuff = (xGestureUngrabEventReq *)req;
-            REPLY (": XID(0x%lx)",
-                stuff->window);
+            REPLY (": XID(0x%x)",
+                (unsigned int)stuff->window);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -171,8 +171,8 @@ _EvlogEventGesture (EvlogInfo *evinfo, int first_base, int detail_level, char *r
     case GestureNotifyFlick:
         {
             xGestureNotifyFlickEvent *stuff = (xGestureNotifyFlickEvent *) evt;
-            REPLY (": XID(0x%lx)",
-                stuff->window);
+            REPLY (": XID(0x%x)",
+                (unsigned int)stuff->window);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -208,8 +208,8 @@ _EvlogEventGesture (EvlogInfo *evinfo, int first_base, int detail_level, char *r
     case GestureNotifyPan:
         {
             xGestureNotifyPanEvent *stuff = (xGestureNotifyPanEvent *) evt;
-            REPLY (": XID(0x%lx)",
-                stuff->window);
+            REPLY (": XID(0x%x)",
+                (unsigned int)stuff->window);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -247,8 +247,8 @@ _EvlogEventGesture (EvlogInfo *evinfo, int first_base, int detail_level, char *r
     case GestureNotifyPinchRotation:
         {
             xGestureNotifyPinchRotationEvent *stuff = (xGestureNotifyPinchRotationEvent *) evt;
-            REPLY (": XID(0x%lx)",
-                stuff->window);
+            REPLY (": XID(0x%x)",
+                (unsigned int)stuff->window);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -286,8 +286,8 @@ _EvlogEventGesture (EvlogInfo *evinfo, int first_base, int detail_level, char *r
     case GestureNotifyTap:
         {
             xGestureNotifyTapEvent *stuff = (xGestureNotifyTapEvent *) evt;
-            REPLY (": XID(0x%lx)",
-                stuff->window);
+            REPLY (": XID(0x%x)",
+                (unsigned int)stuff->window);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -324,8 +324,8 @@ _EvlogEventGesture (EvlogInfo *evinfo, int first_base, int detail_level, char *r
     case GestureNotifyTapNHold:
         {
             xGestureNotifyTapNHoldEvent *stuff = (xGestureNotifyTapNHoldEvent *) evt;
-            REPLY (": XID(0x%lx)",
-                stuff->window);
+            REPLY (": XID(0x%x)",
+                (unsigned int)stuff->window);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -362,8 +362,8 @@ _EvlogEventGesture (EvlogInfo *evinfo, int first_base, int detail_level, char *r
     case GestureNotifyHold:
         {
             xGestureNotifyHoldEvent *stuff = (xGestureNotifyHoldEvent *) evt;
-            REPLY (": XID(0x%lx)",
-                stuff->window);
+            REPLY (": XID(0x%x)",
+                (unsigned int)stuff->window);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -399,8 +399,8 @@ _EvlogEventGesture (EvlogInfo *evinfo, int first_base, int detail_level, char *r
     case GestureNotifyGroup:
         {
             xGestureNotifyGroupEvent *stuff = (xGestureNotifyGroupEvent *) evt;
-            REPLY (": XID(0x%lx) groupID(%d) groupNum(%d)",
-                stuff->window,
+            REPLY (": XID(0x%x) groupID(%d) groupNum(%d)",
+                (unsigned int)stuff->window,
                 stuff->groupid,
                 stuff->num_group);
 
index 0269faa..49ac1f2 100644 (file)
@@ -70,8 +70,8 @@ _EvlogRequestRandr (EvlogInfo *evinfo, int detail_level, char *reply, int *len)
     case X_RRGetScreenSizeRange:
         {
             xRRGetScreenSizeRangeReq *stuff = (xRRGetScreenSizeRangeReq *)req;
-            REPLY (": XID(0x%lx)",
-                stuff->window);
+            REPLY (": XID(0x%x)",
+                (unsigned int)stuff->window);
 
             return reply;
         }
@@ -79,8 +79,8 @@ _EvlogRequestRandr (EvlogInfo *evinfo, int detail_level, char *reply, int *len)
     case X_RRSetScreenSize:
         {
             xRRSetScreenSizeReq *stuff = (xRRSetScreenSizeReq *)req;
-            REPLY (": XID(0x%lx) size(%dx%d)",
-                stuff->window,
+            REPLY (": XID(0x%x) size(%dx%d)",
+                (unsigned int)stuff->window,
                 stuff->width,
                 stuff->height);
 
@@ -97,8 +97,8 @@ _EvlogRequestRandr (EvlogInfo *evinfo, int detail_level, char *reply, int *len)
     case X_RRGetScreenResources:
         {
             xRRGetScreenResourcesReq *stuff = (xRRGetScreenResourcesReq *)req;
-            REPLY (": XID(0x%lx)",
-                stuff->window);
+            REPLY (": XID(0x%x)",
+                (unsigned int)stuff->window);
 
             return reply;
         }
@@ -106,8 +106,8 @@ _EvlogRequestRandr (EvlogInfo *evinfo, int detail_level, char *reply, int *len)
     case X_RRGetOutputInfo:
         {
             xRRGetOutputInfoReq *stuff = (xRRGetOutputInfoReq *)req;
-            REPLY (": XID(0x%lx)",
-                stuff->output);
+            REPLY (": XID(0x%x)",
+                (unsigned int)stuff->output);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -121,8 +121,8 @@ _EvlogRequestRandr (EvlogInfo *evinfo, int detail_level, char *reply, int *len)
     case X_RRListOutputProperties:
         {
             xRRListOutputPropertiesReq *stuff = (xRRListOutputPropertiesReq *)req;
-            REPLY (": XID(0x%lx)",
-                stuff->output);
+            REPLY (": XID(0x%x)",
+                (unsigned int)stuff->output);
 
             return reply;
         }
@@ -130,8 +130,8 @@ _EvlogRequestRandr (EvlogInfo *evinfo, int detail_level, char *reply, int *len)
     case X_RRQueryOutputProperty:
         {
             xRRQueryOutputPropertyReq *stuff = (xRRQueryOutputPropertyReq *)req;
-            REPLY (": XID(0x%lx)",
-                stuff->output);
+            REPLY (": XID(0x%x)",
+                (unsigned int)stuff->output);
 
             REPLY (" Property");
             reply = xDbgGetAtom(stuff->property, evinfo, reply, len);
@@ -142,8 +142,8 @@ _EvlogRequestRandr (EvlogInfo *evinfo, int detail_level, char *reply, int *len)
     case X_RRConfigureOutputProperty:
         {
             xRRConfigureOutputPropertyReq *stuff = (xRRConfigureOutputPropertyReq *)req;
-            REPLY (": XID(0x%lx)",
-                stuff->output);
+            REPLY (": XID(0x%x)",
+                (unsigned int)stuff->output);
 
             REPLY (" Property");
             reply = xDbgGetAtom(stuff->property, evinfo, reply, len);
@@ -161,8 +161,8 @@ _EvlogRequestRandr (EvlogInfo *evinfo, int detail_level, char *reply, int *len)
     case X_RRChangeOutputProperty:
         {
             xRRChangeOutputPropertyReq *stuff = (xRRChangeOutputPropertyReq *)req;
-            REPLY (": XID(0x%lx)",
-                stuff->output);
+            REPLY (": XID(0x%x)",
+                (unsigned int)stuff->output);
 
             REPLY (" Property");
             reply = xDbgGetAtom(stuff->property, evinfo, reply, len);
@@ -196,8 +196,8 @@ _EvlogRequestRandr (EvlogInfo *evinfo, int detail_level, char *reply, int *len)
     case X_RRDeleteOutputProperty:
         {
             xRRDeleteOutputPropertyReq *stuff = (xRRDeleteOutputPropertyReq *)req;
-            REPLY (": XID(0x%lx)",
-                stuff->output);
+            REPLY (": XID(0x%x)",
+                (unsigned int)stuff->output);
 
             REPLY (" Property");
             reply = xDbgGetAtom(stuff->property, evinfo, reply, len);
@@ -208,8 +208,8 @@ _EvlogRequestRandr (EvlogInfo *evinfo, int detail_level, char *reply, int *len)
     case X_RRGetOutputProperty:
         {
             xRRGetOutputPropertyReq *stuff = (xRRGetOutputPropertyReq *)req;
-            REPLY (": XID(0x%lx)",
-                stuff->output);
+            REPLY (": XID(0x%x)",
+                (unsigned int)stuff->output);
 
             REPLY (" Property");
             reply = xDbgGetAtom(stuff->property, evinfo, reply, len);
@@ -229,8 +229,8 @@ _EvlogRequestRandr (EvlogInfo *evinfo, int detail_level, char *reply, int *len)
     case X_RRGetCrtcInfo:
         {
             xRRGetCrtcInfoReq *stuff = (xRRGetCrtcInfoReq *)req;
-            REPLY (": XID(0x%lx)",
-                stuff->crtc);
+            REPLY (": XID(0x%x)",
+                (unsigned int)stuff->crtc);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -244,8 +244,8 @@ _EvlogRequestRandr (EvlogInfo *evinfo, int detail_level, char *reply, int *len)
     case X_RRSetCrtcConfig:
         {
             xRRSetCrtcConfigReq *stuff = (xRRSetCrtcConfigReq *)req;
-            REPLY (": XID(0x%lx) coord(%d,%d) ",
-                stuff->crtc,
+            REPLY (": XID(0x%x) coord(%d,%d) ",
+                (unsigned int)stuff->crtc,
                 stuff->x,
                 stuff->y);
 
@@ -263,11 +263,11 @@ _EvlogRequestRandr (EvlogInfo *evinfo, int detail_level, char *reply, int *len)
                 }
 
                 REPLY ("\n");
-                REPLY ("%67s timestamp(%lums) config_timestamp(%lums) RRmode(0x%lx) rotation(%s)",
+                REPLY ("%67s timestamp(%lums) config_timestamp(%lums) RRmode(0x%x) rotation(%s)",
                     " ",
                     stuff->timestamp,
                     stuff->configTimestamp,
-                    stuff->mode,
+                    (unsigned int)stuff->mode,
                     rotation);
             }
 
@@ -277,8 +277,8 @@ _EvlogRequestRandr (EvlogInfo *evinfo, int detail_level, char *reply, int *len)
     case X_RRGetScreenResourcesCurrent:
         {
             xRRGetScreenResourcesCurrentReq *stuff = (xRRGetScreenResourcesCurrentReq *)req;
-            REPLY (": XID(0x%lx)",
-                stuff->window);
+            REPLY (": XID(0x%x)",
+                (unsigned int)stuff->window);
 
             return reply;
         }
@@ -301,9 +301,9 @@ _EvlogEventRandr (EvlogInfo *evinfo, int first_base, int detail_level, char *rep
     case RRScreenChangeNotify:
         {
             xRRScreenChangeNotifyEvent *stuff = (xRRScreenChangeNotifyEvent *) evt;
-            REPLY (": Root(0x%lx) Window(0x%lx)",
-                stuff->root,
-                stuff->window);
+            REPLY (": Root(0x%x) Window(0x%x)",
+                (unsigned int)stuff->root,
+                (unsigned int)stuff->window);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -345,10 +345,10 @@ _EvlogEventRandr (EvlogInfo *evinfo, int first_base, int detail_level, char *rep
             case RRNotify_CrtcChange:
                 {
                     xRRCrtcChangeNotifyEvent *stuff = (xRRCrtcChangeNotifyEvent *) evt;
-                    REPLY (": XID(0x%lx) Crtc(0x%lx) RRmode(0x%lx) new_size(%udx%ud) new_coord(%d,%d)",
-                        stuff->window,
-                        stuff->crtc,
-                        stuff->mode,
+                    REPLY (": XID(0x%x) Crtc(0x%x) RRmode(0x%x) new_size(%udx%ud) new_coord(%d,%d)",
+                        (unsigned int)stuff->window,
+                        (unsigned int)stuff->crtc,
+                        (unsigned int)stuff->mode,
                         stuff->width,
                         stuff->height,
                         stuff->x,
@@ -381,11 +381,11 @@ _EvlogEventRandr (EvlogInfo *evinfo, int first_base, int detail_level, char *rep
             case RRNotify_OutputChange:
                 {
                     xRROutputChangeNotifyEvent *stuff = (xRROutputChangeNotifyEvent *) evt;
-                    REPLY (": XID(0x%lx) Output(0x%lx) Crtc(0x%lx) RRmode(0x%lx)",
-                        stuff->window,
-                        stuff->output,
-                        stuff->crtc,
-                        stuff->mode);
+                    REPLY (": XID(0x%x) Output(0x%x) Crtc(0x%x) RRmode(0x%x)",
+                        (unsigned int)stuff->window,
+                        (unsigned int)stuff->output,
+                        (unsigned int)stuff->crtc,
+                        (unsigned int)stuff->mode);
 
                     if (detail_level >= EVLOG_PRINT_DETAIL)
                     {
@@ -439,9 +439,9 @@ _EvlogEventRandr (EvlogInfo *evinfo, int first_base, int detail_level, char *rep
             case RRNotify_OutputProperty:
                 {
                     xRROutputPropertyNotifyEvent *stuff = (xRROutputPropertyNotifyEvent *) evt;
-                    REPLY (": XID(0x%lx) Output(0x%lx)",
-                        stuff->window,
-                        stuff->output);
+                    REPLY (": XID(0x%x) Output(0x%x)",
+                        (unsigned int)stuff->window,
+                        (unsigned int)stuff->output);
 
                     REPLY (" Property");
                     reply = xDbgGetAtom(stuff->atom, evinfo, reply, len);
@@ -472,9 +472,9 @@ _EvlogEventRandr (EvlogInfo *evinfo, int first_base, int detail_level, char *rep
             case RRNotify_ProviderChange:
                 {
                     xRRProviderChangeNotifyEvent *stuff = (xRRProviderChangeNotifyEvent *) evt;
-                    REPLY (": XID(0x%lx) Provider(0x%lx)",
-                        stuff->window,
-                        stuff->provider);
+                    REPLY (": XID(0x%x) Provider(0x%x)",
+                        (unsigned int)stuff->window,
+                        (unsigned int)stuff->provider);
 
                     if (detail_level >= EVLOG_PRINT_DETAIL)
                     {
@@ -489,9 +489,9 @@ _EvlogEventRandr (EvlogInfo *evinfo, int first_base, int detail_level, char *rep
             case RRNotify_ProviderProperty:
                 {
                     xRRProviderPropertyNotifyEvent *stuff = (xRRProviderPropertyNotifyEvent *) evt;
-                    REPLY (": XID(0x%lx) Provider(0x%lx)",
-                        stuff->window,
-                        stuff->provider);
+                    REPLY (": XID(0x%x) Provider(0x%x)",
+                        (unsigned int)stuff->window,
+                        (unsigned int)stuff->provider);
 
                     REPLY (" Atom");
                     reply = xDbgGetAtom(stuff->atom, evinfo, reply, len);
@@ -520,8 +520,8 @@ _EvlogEventRandr (EvlogInfo *evinfo, int first_base, int detail_level, char *rep
             case RRNotify_ResourceChange:
                 {
                     xRRResourceChangeNotifyEvent *stuff = (xRRResourceChangeNotifyEvent *) evt;
-                    REPLY (": XID(0x%lx)",
-                        stuff->window);
+                    REPLY (": XID(0x%x)",
+                        (unsigned int)stuff->window);
 
                     if (detail_level >= EVLOG_PRINT_DETAIL)
                     {
@@ -606,7 +606,7 @@ _EvlogReplyRandr (EvlogInfo *evinfo, int detail_level, char *reply, int *len)
                 REPLY ("(");
                 for (i = 0 ; i < nCrtcs ; i++)
                 {
-                    REPLY ("0x%lx", crtcs[i]);
+                    REPLY ("0x%x", (unsigned int)crtcs[i]);
                     if(i != nCrtcs - 1)
                         REPLY (", ");
                 }
@@ -616,7 +616,7 @@ _EvlogReplyRandr (EvlogInfo *evinfo, int detail_level, char *reply, int *len)
                 REPLY ("(");
                 for (i = 0 ; i < nOutputs ; i++)
                 {
-                    REPLY ("0x%lx", outputs[i]);
+                    REPLY ("0x%x", (unsigned int)outputs[i]);
                     if(i != nOutputs - 1)
                         REPLY (", ");
                 }
@@ -626,7 +626,7 @@ _EvlogReplyRandr (EvlogInfo *evinfo, int detail_level, char *reply, int *len)
                 REPLY ("(");
                 for (i = 0 ; i < nModes ; i++)
                 {
-                    REPLY ("0x%lx %dx%d", modeinfos[i].id, modeinfos[i].width, modeinfos[i].height);
+                    REPLY ("0x%x %dx%d", (unsigned int)modeinfos[i].id, modeinfos[i].width, modeinfos[i].height);
                     if(i != nModes - 1)
                         REPLY (", ");
                 }
@@ -651,9 +651,9 @@ _EvlogReplyRandr (EvlogInfo *evinfo, int detail_level, char *reply, int *len)
             if (evinfo->rep.isStart)
             {
                 xRRGetOutputInfoReply *stuff = (xRRGetOutputInfoReply *)rep;
-                REPLY (": Timestamp(%ldms) Crtc(0x%lx) mmSize(%ldx%ld) nCrtcs(%d) nModes(%d) nPreferred(%d) nClones(%d)",
+                REPLY (": Timestamp(%ldms) Crtc(0x%x) mmSize(%ldx%ld) nCrtcs(%d) nModes(%d) nPreferred(%d) nClones(%d)",
                     stuff->timestamp,
-                    stuff->crtc,
+                    (unsigned int)stuff->crtc,
                     stuff->mmWidth,
                     stuff->mmHeight,
                     stuff->nCrtcs,
@@ -680,7 +680,7 @@ _EvlogReplyRandr (EvlogInfo *evinfo, int detail_level, char *reply, int *len)
                 REPLY ("(");
                 for (i = 0 ; i < nCrtcs ; i++)
                 {
-                    REPLY ("0x%lx", crtcs[i]);
+                    REPLY ("0x%x", (unsigned int)crtcs[i]);
                     if(i != nCrtcs - 1)
                         REPLY (", ");
                 }
@@ -690,7 +690,7 @@ _EvlogReplyRandr (EvlogInfo *evinfo, int detail_level, char *reply, int *len)
                 REPLY ("(");
                 for (i = 0 ; i < nModes ; i++)
                 {
-                    REPLY ("0x%lx", modes[i]);
+                    REPLY ("0x%x", (unsigned int)modes[i]);
                     if(i != nModes - 1)
                         REPLY (", ");
                 }
@@ -700,7 +700,7 @@ _EvlogReplyRandr (EvlogInfo *evinfo, int detail_level, char *reply, int *len)
                 REPLY ("(");
                 for (i = 0 ; i < nClones ; i++)
                 {
-                    REPLY ("0x%lx", clones[i]);
+                    REPLY ("0x%x", (unsigned int)clones[i]);
                     if(i != nClones - 1)
                         REPLY (", ");
                 }
@@ -767,13 +767,13 @@ _EvlogReplyRandr (EvlogInfo *evinfo, int detail_level, char *reply, int *len)
             if (evinfo->rep.isStart)
             {
                 xRRGetCrtcInfoReply *stuff = (xRRGetCrtcInfoReply *)rep;
-                REPLY (" Timestamp(%ldms) coord(%d,%d %dx%d) RRmode(0x%lx) rot(%d) rots(%d) nOutput(%d) nPossibleOutput(%d)",
+                REPLY (" Timestamp(%ldms) coord(%d,%d %dx%d) RRmode(0x%x) rot(%d) rots(%d) nOutput(%d) nPossibleOutput(%d)",
                     stuff->timestamp,
                     stuff->x,
                     stuff->y,
                     stuff->width,
                     stuff->height,
-                    stuff->mode,
+                    (unsigned int)stuff->mode,
                     stuff->rotation,
                     stuff->rotations,
                     stuff->nOutput,
@@ -792,7 +792,7 @@ _EvlogReplyRandr (EvlogInfo *evinfo, int detail_level, char *reply, int *len)
                 REPLY ("(");
                 for (i = 0 ; i < nOutput ; i++)
                 {
-                    REPLY ("0x%lx", outputs[i]);
+                    REPLY ("0x%x", (unsigned int)outputs[i]);
                     if(i != nOutput - 1)
                         REPLY (", ");
                 }
@@ -802,7 +802,7 @@ _EvlogReplyRandr (EvlogInfo *evinfo, int detail_level, char *reply, int *len)
                 REPLY ("(");
                 for (i = 0 ; i < nPossibleOutput ; i++)
                 {
-                    REPLY ("0x%lx", possible[i]);
+                    REPLY ("0x%x", (unsigned int)possible[i]);
                     if(i != nPossibleOutput - 1)
                         REPLY (", ");
                 }
@@ -863,7 +863,7 @@ _EvlogReplyRandr (EvlogInfo *evinfo, int detail_level, char *reply, int *len)
                 REPLY ("(");
                 for (i = 0 ; i < nCrtcs ; i++)
                 {
-                    REPLY ("0x%lx", crtcs[i]);
+                    REPLY ("0x%x", (unsigned int)crtcs[i]);
                     if(i != nCrtcs - 1)
                         REPLY (", ");
                 }
@@ -873,7 +873,7 @@ _EvlogReplyRandr (EvlogInfo *evinfo, int detail_level, char *reply, int *len)
                 REPLY ("(");
                 for (i = 0 ; i < nOutputs ; i++)
                 {
-                    REPLY ("0x%lx", outputs[i]);
+                    REPLY ("0x%x", (unsigned int)outputs[i]);
                     if(i != nOutputs - 1)
                         REPLY (", ");
                 }
@@ -883,7 +883,7 @@ _EvlogReplyRandr (EvlogInfo *evinfo, int detail_level, char *reply, int *len)
                 REPLY ("(");
                 for (i = 0 ; i < nModes ; i++)
                 {
-                    REPLY ("0x%lx %dx%d", modeinfos[i].id, modeinfos[i].width, modeinfos[i].height);
+                    REPLY ("0x%x %dx%d", (unsigned int)modeinfos[i].id, modeinfos[i].width, modeinfos[i].height);
                     if(i != nModes - 1)
                         REPLY (", ");
                 }
index b67705e..c8e3ac4 100644 (file)
@@ -114,9 +114,9 @@ _EvlogRequestXextShm (EvlogInfo *evinfo, int detail_level, char *reply, int *len
     case X_ShmPutImage:
         {
             xShmPutImageReq *stuff = (xShmPutImageReq *)req;
-            REPLY (": XID(0x%lx) gc(0x%lx) size(%dx%d) src(%d,%d %dx%d) dst(%d,%d)",
-                stuff->drawable,
-                stuff->gc,
+            REPLY (": XID(0x%x) gc(0x%x) size(%dx%d) src(%d,%d %dx%d) dst(%d,%d)",
+                (unsigned int)stuff->drawable,
+                (unsigned int)stuff->gc,
                 stuff->totalWidth,
                 stuff->totalHeight,
                 stuff->srcX,
@@ -140,12 +140,12 @@ _EvlogRequestXextShm (EvlogInfo *evinfo, int detail_level, char *reply, int *len
                 }
 
                 REPLY ("\n");
-                REPLY ("%67s depth(%d) format(%s) send_event(%s) shmseg(0x%lx) offset(%ld)",
+                REPLY ("%67s depth(%d) format(%s) send_event(%s) shmseg(0x%x) offset(%ld)",
                     " ",
                     stuff->depth,
                     format,
                     stuff->sendEvent ? "YES" : "NO",
-                    stuff->shmseg,
+                    (unsigned int)stuff->shmseg,
                     stuff->offset);
             }
 
@@ -155,8 +155,8 @@ _EvlogRequestXextShm (EvlogInfo *evinfo, int detail_level, char *reply, int *len
     case X_ShmGetImage:
         {
             xShmGetImageReq *stuff = (xShmGetImageReq *)req;
-            REPLY (": XID(0x%lx) size(%dx%d) coord(%d,%d)",
-                stuff->drawable,
+            REPLY (": XID(0x%x) size(%dx%d) coord(%d,%d)",
+                (unsigned int)stuff->drawable,
                 stuff->width,
                 stuff->height,
                 stuff->x,
@@ -176,11 +176,11 @@ _EvlogRequestXextShm (EvlogInfo *evinfo, int detail_level, char *reply, int *len
                 }
 
                 REPLY ("\n");
-                REPLY ("%67s format(%s) plain_mask(0x%lx) shmseg(0x%lx) offset(%ld)",
+                REPLY ("%67s format(%s) plain_mask(0x%x) shmseg(0x%x) offset(%ld)",
                     " ",
                     format,
-                    stuff->planeMask,
-                    stuff->shmseg,
+                    (unsigned int)stuff->planeMask,
+                    (unsigned int)stuff->shmseg,
                     stuff->offset);
             }
 
@@ -190,19 +190,19 @@ _EvlogRequestXextShm (EvlogInfo *evinfo, int detail_level, char *reply, int *len
     case X_ShmCreatePixmap:
         {
             xShmCreatePixmapReq *stuff = (xShmCreatePixmapReq *)req;
-            REPLY (": Pixmap(0x%lx) Drawable(0x%lx) size(%dx%d)",
-                stuff->pid,
-                stuff->drawable,
+            REPLY (": Pixmap(0x%x) Drawable(0x%x) size(%dx%d)",
+                (unsigned int)stuff->pid,
+                (unsigned int)stuff->drawable,
                 stuff->width,
                 stuff->height);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
                 REPLY ("\n");
-                REPLY ("%67s depth(%d) shmseg(0x%lx) offset(%ld)",
+                REPLY ("%67s depth(%d) shmseg(0x%x) offset(%ld)",
                     " ",
                     stuff->depth,
-                    stuff->shmseg,
+                    (unsigned int)stuff->shmseg,
                     stuff->offset);
             }
 
@@ -226,8 +226,8 @@ _EvlogRequestXextSync(EvlogInfo *evinfo, int detail_level, char *reply, int *len
     case X_SyncCreateCounter:
         {
             xSyncCreateCounterReq *stuff = (xSyncCreateCounterReq *)req;
-            REPLY (": XID(0x%lx) initValue(%ld/%ld)",
-                stuff->cid,
+            REPLY (": XID(0x%x) initValue(%ld/%ld)",
+                (unsigned int)stuff->cid,
                 stuff->initial_value_hi,
                 stuff->initial_value_lo);
 
@@ -237,8 +237,8 @@ _EvlogRequestXextSync(EvlogInfo *evinfo, int detail_level, char *reply, int *len
     case X_SyncSetCounter:
         {
             xSyncSetCounterReq *stuff = (xSyncSetCounterReq *)req;
-            REPLY (": XID(0x%lx) Value(%ld/%ld)",
-                stuff->cid,
+            REPLY (": XID(0x%x) Value(%ld/%ld)",
+                (unsigned int)stuff->cid,
                 stuff->value_hi,
                 stuff->value_lo);
 
@@ -248,8 +248,8 @@ _EvlogRequestXextSync(EvlogInfo *evinfo, int detail_level, char *reply, int *len
     case X_SyncChangeCounter:
         {
             xSyncChangeCounterReq *stuff = (xSyncChangeCounterReq *)req;
-            REPLY (": XID(0x%lx) Value(%ld/%ld)",
-                stuff->cid,
+            REPLY (": XID(0x%x) Value(%ld/%ld)",
+                (unsigned int)stuff->cid,
                 stuff->value_hi,
                 stuff->value_lo);
 
@@ -259,8 +259,8 @@ _EvlogRequestXextSync(EvlogInfo *evinfo, int detail_level, char *reply, int *len
     case X_SyncQueryCounter:
         {
             xSyncQueryCounterReq *stuff = (xSyncQueryCounterReq *)req;
-            REPLY (": XID(0x%lx)",
-                stuff->counter);
+            REPLY (": XID(0x%x)",
+                (unsigned int)stuff->counter);
 
             return reply;
         }
@@ -268,8 +268,8 @@ _EvlogRequestXextSync(EvlogInfo *evinfo, int detail_level, char *reply, int *len
     case X_SyncDestroyCounter:
         {
             xSyncDestroyCounterReq *stuff = (xSyncDestroyCounterReq *)req;
-            REPLY (": XID(0x%lx)",
-                stuff->counter);
+            REPLY (": XID(0x%x)",
+                (unsigned int)stuff->counter);
 
             return reply;
         }
@@ -280,8 +280,8 @@ _EvlogRequestXextSync(EvlogInfo *evinfo, int detail_level, char *reply, int *len
             xSyncWaitCondition *pProtocolWaitConds;
 
             pProtocolWaitConds = (xSyncWaitCondition *) &stuff[1];
-            REPLY (": XID(0x%lx) VType:%d TType:%d Value(%d/%d)",
-                pProtocolWaitConds->counter,
+            REPLY (": XID(0x%x) VType:%d TType:%d Value(%d/%d)",
+                (unsigned int)pProtocolWaitConds->counter,
                 (unsigned int)pProtocolWaitConds->value_type,
                 (unsigned int)pProtocolWaitConds->test_type,
                 (unsigned int)pProtocolWaitConds->wait_value_hi,
@@ -305,8 +305,8 @@ _EvlogRequestXextXtestExt1(EvlogInfo *evinfo, int detail_level, char *reply, int
     case X_TestFakeInput:
         {
             xTestFakeInputReq *stuff = (xTestFakeInputReq *)req;
-            REPLY (": XID(0x%lx)",
-                stuff->ack);
+            REPLY (": XID(0x%x)",
+                (unsigned int)stuff->ack);
 
             return reply;
         }
@@ -314,8 +314,8 @@ _EvlogRequestXextXtestExt1(EvlogInfo *evinfo, int detail_level, char *reply, int
     case X_TestGetInput:
         {
             xTestGetInputReq *stuff = (xTestGetInputReq *)req;
-            REPLY (": XID(0x%lx)",
-                stuff->mode);
+            REPLY (": XID(0x%x)",
+                (unsigned int)stuff->mode);
 
             return reply;
         }
@@ -348,9 +348,9 @@ _EvlogRequestXextXtest(EvlogInfo *evinfo, int detail_level, char *reply, int *le
     case X_XTestCompareCursor:
         {
             xXTestCompareCursorReq *stuff = (xXTestCompareCursorReq *)req;
-            REPLY (": XID(0x%lx) Cursor(0x%lx)",
-                stuff->window,
-                stuff->cursor);
+            REPLY (": XID(0x%x) Cursor(0x%x)",
+                (unsigned int)stuff->window,
+                (unsigned int)stuff->cursor);
 
             return reply;
         }
@@ -358,8 +358,8 @@ _EvlogRequestXextXtest(EvlogInfo *evinfo, int detail_level, char *reply, int *le
     case X_XTestFakeInput:
         {
             xXTestFakeInputReq *stuff = (xXTestFakeInputReq *)req;
-            REPLY (": XID(0x%lx) coord(%d,%d)",
-                stuff->root,
+            REPLY (": XID(0x%x) coord(%d,%d)",
+                (unsigned int)stuff->root,
                 stuff->rootX,
                 stuff->rootY);
 
@@ -389,8 +389,8 @@ _EvlogRequestXextShape(EvlogInfo *evinfo, int detail_level, char *reply, int *le
     case X_ShapeRectangles:
         {
             xShapeRectanglesReq *stuff = (xShapeRectanglesReq *)req;
-            REPLY (": XID(0x%lx) coord(%d,%d)",
-                stuff->dest,
+            REPLY (": XID(0x%x) coord(%d,%d)",
+                (unsigned int)stuff->dest,
                 stuff->xOff,
                 stuff->yOff);
 
@@ -453,11 +453,11 @@ _EvlogRequestXextShape(EvlogInfo *evinfo, int detail_level, char *reply, int *le
     case X_ShapeMask:
         {
             xShapeMaskReq *stuff = (xShapeMaskReq *)req;
-            REPLY (": XID(0x%lx) coord(%d,%d) src(0x%lx)",
-                stuff->dest,
+            REPLY (": XID(0x%x) coord(%d,%d) src(0x%x)",
+                (unsigned int)stuff->dest,
                 stuff->xOff,
                 stuff->yOff,
-                stuff->src);
+                (unsigned int)stuff->src);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -483,11 +483,11 @@ _EvlogRequestXextShape(EvlogInfo *evinfo, int detail_level, char *reply, int *le
     case X_ShapeCombine:
         {
             xShapeCombineReq *stuff = (xShapeCombineReq *)req;
-            REPLY (": XID(0x%lx) coord(%d,%d) src(0x%lx)",
-                stuff->dest,
+            REPLY (": XID(0x%x) coord(%d,%d) src(0x%x)",
+                (unsigned int)stuff->dest,
                 stuff->xOff,
                 stuff->yOff,
-                stuff->src);
+                (unsigned int)stuff->src);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -522,8 +522,8 @@ _EvlogRequestXextShape(EvlogInfo *evinfo, int detail_level, char *reply, int *le
     case X_ShapeOffset:
         {
             xShapeOffsetReq *stuff = (xShapeOffsetReq *)req;
-            REPLY (": XID(0x%lx) coord(%d,%d)",
-                stuff->dest,
+            REPLY (": XID(0x%x) coord(%d,%d)",
+                (unsigned int)stuff->dest,
                 stuff->xOff,
                 stuff->yOff);
 
@@ -550,8 +550,8 @@ _EvlogRequestXextShape(EvlogInfo *evinfo, int detail_level, char *reply, int *le
     case X_ShapeQueryExtents:
         {
             xShapeQueryExtentsReq *stuff = (xShapeQueryExtentsReq *)req;
-            REPLY (": XID(0x%lx)",
-                stuff->window);
+            REPLY (": XID(0x%x)",
+                (unsigned int)stuff->window);
 
             return reply;
         }
@@ -559,8 +559,8 @@ _EvlogRequestXextShape(EvlogInfo *evinfo, int detail_level, char *reply, int *le
     case X_ShapeSelectInput:
         {
             xShapeSelectInputReq *stuff = (xShapeSelectInputReq *)req;
-            REPLY (": XID(0x%lx)",
-                stuff->window);
+            REPLY (": XID(0x%x)",
+                (unsigned int)stuff->window);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -574,8 +574,8 @@ _EvlogRequestXextShape(EvlogInfo *evinfo, int detail_level, char *reply, int *le
     case X_ShapeInputSelected:
         {
             xShapeInputSelectedReq *stuff = (xShapeInputSelectedReq *)req;
-            REPLY (": XID(0x%lx)",
-                stuff->window);
+            REPLY (": XID(0x%x)",
+                (unsigned int)stuff->window);
 
             return reply;
         }
@@ -583,8 +583,8 @@ _EvlogRequestXextShape(EvlogInfo *evinfo, int detail_level, char *reply, int *le
     case X_ShapeGetRectangles:
         {
             xShapeGetRectanglesReq *stuff = (xShapeGetRectanglesReq *)req;
-            REPLY (": XID(0x%lx)",
-                stuff->window);
+            REPLY (": XID(0x%x)",
+                (unsigned int)stuff->window);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -640,16 +640,16 @@ _EvlogEventXextShm (EvlogInfo *evinfo, int first_base, int detail_level, char *r
     case ShmCompletion:
         {
             xShmCompletionEvent *stuff = (xShmCompletionEvent *) evt;
-            REPLY (": XID(0x%lx)",
-                stuff->drawable);
+            REPLY (": XID(0x%x)",
+                (unsigned int)stuff->drawable);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
-                REPLY (" sequence_num(%d) major_event(%d) minor_event(%d) shmseg(0x%lx) offset(%ld)",
+                REPLY (" sequence_num(%d) major_event(%d) minor_event(%d) shmseg(0x%x) offset(%ld)",
                     stuff->sequenceNumber,
                     stuff->majorEvent,
                     stuff->minorEvent,
-                    stuff->shmseg,
+                    (unsigned int)stuff->shmseg,
                     stuff->offset);
             }
             return reply;
@@ -673,12 +673,12 @@ _EvlogEventXextSync (EvlogInfo *evinfo, int first_base, int detail_level, char *
     case XSyncCounterNotify:
         {
             xSyncCounterNotifyEvent *stuff = (xSyncCounterNotifyEvent *) evt;
-            REPLY (": XID(0x%lx) WaitValue(0x%lx/0x%lx) CounterValue(0x%lx/0x%lx)",
-                stuff->counter,
-                stuff->wait_value_hi,
-                stuff->wait_value_lo,
-                stuff->counter_value_hi,
-                stuff->counter_value_lo);
+            REPLY (": XID(0x%x) WaitValue(0x%x/0x%x) CounterValue(0x%x/0x%x)",
+                (unsigned int)stuff->counter,
+                (unsigned int)stuff->wait_value_hi,
+                (unsigned int)stuff->wait_value_lo,
+                (unsigned int)stuff->counter_value_hi,
+                (unsigned int)stuff->counter_value_lo);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -697,12 +697,12 @@ _EvlogEventXextSync (EvlogInfo *evinfo, int first_base, int detail_level, char *
     case XSyncAlarmNotify:
         {
             xSyncAlarmNotifyEvent *stuff = (xSyncAlarmNotifyEvent *) evt;
-            REPLY (": XID(0x%lx) CounterValue(0x%lx/0x%lx) AlarmValue(0x%lx/0x%lx)",
-                stuff->alarm,
-                stuff->counter_value_hi,
-                stuff->counter_value_lo,
-                stuff->alarm_value_hi,
-                stuff->alarm_value_lo);
+            REPLY (": XID(0x%x) CounterValue(0x%x/0x%x) AlarmValue(0x%x/0x%x)",
+                (unsigned int)stuff->alarm,
+                (unsigned int)stuff->counter_value_hi,
+                (unsigned int)stuff->counter_value_lo,
+                (unsigned int)stuff->alarm_value_hi,
+                (unsigned int)stuff->alarm_value_lo);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -765,8 +765,8 @@ _EvlogEventXextShape (EvlogInfo *evinfo, int first_base, int detail_level, char
     case ShapeNotify:
         {
             xShapeNotifyEvent *stuff = (xShapeNotifyEvent *) evt;
-            REPLY (": XID(0x%lx) coord(%d,%d %dx%d)",
-                stuff->window,
+            REPLY (": XID(0x%x) coord(%d,%d %dx%d)",
+                (unsigned int)stuff->window,
                 stuff->x,
                 stuff->y,
                 stuff->width,
@@ -850,8 +850,8 @@ _EvlogReplyXextShm (EvlogInfo *evinfo, int detail_level, char *reply, int *len)
             if (evinfo->rep.isStart)
             {
                 xShmGetImageReply *stuff = (xShmGetImageReply *)rep;
-                REPLY (": Visual(0x%lx) size(%ld) sequence_num(%d)",
-                    stuff->visual,
+                REPLY (": Visual(0x%x) size(%ld) sequence_num(%d)",
+                    (unsigned int)stuff->visual,
                     stuff->size,
                     stuff->sequenceNumber);
             }
@@ -914,8 +914,8 @@ _EvlogReplyXextXtestExt1 (EvlogInfo *evinfo, int detail_level, char *reply, int
             if (evinfo->rep.isStart)
             {
                 xTestQueryInputSizeReply *stuff = (xTestQueryInputSizeReply *)rep;
-                REPLY (": sizeReturn(0x%lx) sequence_num(%d)",
-                    stuff->size_return,
+                REPLY (": sizeReturn(0x%x) sequence_num(%d)",
+                    (unsigned int)stuff->size_return,
                     stuff->sequenceNumber);
             }
             else
index df0313c..bdc9bbc 100644 (file)
@@ -91,8 +91,8 @@ _EvlogRequestXinput (EvlogInfo *evinfo, int detail_level, char *reply, int *len)
     case X_GrabDevice:
         {
             xGrabDeviceReq *stuff = (xGrabDeviceReq *)req;
-            REPLY (": XID(0x%lx) device_ID(%d)",
-                stuff->grabWindow,
+            REPLY (": XID(0x%x) device_ID(%d)",
+                (unsigned int)stuff->grabWindow,
                 stuff->deviceid);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
@@ -134,8 +134,8 @@ _EvlogRequestXinput (EvlogInfo *evinfo, int detail_level, char *reply, int *len)
     case X_GrabDeviceKey:
         {
             xGrabDeviceKeyReq *stuff = (xGrabDeviceKeyReq *)req;
-            REPLY (": XID(0x%lx)",
-                stuff->grabWindow);
+            REPLY (": XID(0x%x)",
+                (unsigned int)stuff->grabWindow);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -169,8 +169,8 @@ _EvlogRequestXinput (EvlogInfo *evinfo, int detail_level, char *reply, int *len)
     case X_UngrabDeviceKey:
         {
             xUngrabDeviceKeyReq *stuff = (xUngrabDeviceKeyReq *)req;
-            REPLY (": XID(0x%lx)",
-                stuff->grabWindow);
+            REPLY (": XID(0x%x)",
+                (unsigned int)stuff->grabWindow);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -187,8 +187,8 @@ _EvlogRequestXinput (EvlogInfo *evinfo, int detail_level, char *reply, int *len)
     case X_GrabDeviceButton:
         {
             xGrabDeviceButtonReq *stuff = (xGrabDeviceButtonReq *)req;
-            REPLY (": XID(0x%lx))",
-                stuff->grabWindow);
+            REPLY (": XID(0x%x))",
+                (unsigned int)stuff->grabWindow);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -221,8 +221,8 @@ _EvlogRequestXinput (EvlogInfo *evinfo, int detail_level, char *reply, int *len)
     case X_UngrabDeviceButton:
         {
             xUngrabDeviceButtonReq *stuff = (xUngrabDeviceButtonReq *)req;
-            REPLY (": XID(0x%lx)",
-                stuff->grabWindow);
+            REPLY (": XID(0x%x)",
+                (unsigned int)stuff->grabWindow);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -264,8 +264,8 @@ _EvlogRequestXinput (EvlogInfo *evinfo, int detail_level, char *reply, int *len)
     case X_SetDeviceFocus:
         {
             xSetDeviceFocusReq *stuff = (xSetDeviceFocusReq *)req;
-            REPLY (": XID(0x%lx) dev_ID(%d)",
-                stuff->focus,
+            REPLY (": XID(0x%x) dev_ID(%d)",
+                (unsigned int)stuff->focus,
                 stuff->device);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
@@ -675,15 +675,15 @@ _EvlogEventXinput (EvlogInfo *evinfo, int first_base, int detail_level, char *re
     case XI_DeviceKeyPress:
         {
             XDeviceKeyPressedEvent *stuff = (XDeviceKeyPressedEvent *) evt;
-            REPLY (": XID(0x%lx) Window(0x%lx %d,%d) Root(0x%lx %d,%d) subWindow(0x%lx)",
-                stuff->deviceid,
-                stuff->window,
+            REPLY (": XID(0x%x) Window(0x%x %d,%d) Root(0x%x %d,%d) subWindow(0x%x)",
+                (unsigned int)stuff->deviceid,
+                (unsigned int)stuff->window,
                 stuff->x,
                 stuff->y,
-                stuff->root,
+                (unsigned int)stuff->root,
                 stuff->x_root,
                 stuff->y_root,
-                stuff->subwindow);
+                (unsigned int)stuff->subwindow);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -704,15 +704,15 @@ _EvlogEventXinput (EvlogInfo *evinfo, int first_base, int detail_level, char *re
     case XI_DeviceKeyRelease:
         {
             XDeviceKeyReleasedEvent *stuff = (XDeviceKeyReleasedEvent *) evt;
-            REPLY (": XID(0x%lx) Window(0x%lx %d,%d) Root(0x%lx %d,%d) subWindow(0x%lx)",
-                stuff->deviceid,
-                stuff->window,
+            REPLY (": XID(0x%x) Window(0x%x %d,%d) Root(0x%x %d,%d) subWindow(0x%x)",
+                (unsigned int)stuff->deviceid,
+                (unsigned int)stuff->window,
                 stuff->x,
                 stuff->y,
-                stuff->root,
+                (unsigned int)stuff->root,
                 stuff->x_root,
                 stuff->y_root,
-                stuff->subwindow);
+                (unsigned int)stuff->subwindow);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -733,15 +733,15 @@ _EvlogEventXinput (EvlogInfo *evinfo, int first_base, int detail_level, char *re
     case XI_DeviceButtonPress:
         {
             XDeviceButtonPressedEvent *stuff = (XDeviceButtonPressedEvent *) evt;
-            REPLY (": XID(0x%lx) Window(0x%lx %d,%d) Root(0x%lx %d,%d) subWindow(0x%lx)",
-                stuff->deviceid,
-                stuff->window,
+            REPLY (": XID(0x%x) Window(0x%x %d,%d) Root(0x%x %d,%d) subWindow(0x%x)",
+                (unsigned int)stuff->deviceid,
+                (unsigned int)stuff->window,
                 stuff->x,
                 stuff->y,
-                stuff->root,
+                (unsigned int)stuff->root,
                 stuff->x_root,
                 stuff->y_root,
-                stuff->subwindow);
+                (unsigned int)stuff->subwindow);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -762,15 +762,15 @@ _EvlogEventXinput (EvlogInfo *evinfo, int first_base, int detail_level, char *re
     case XI_DeviceButtonRelease:
         {
             XDeviceButtonReleasedEvent *stuff = (XDeviceButtonReleasedEvent *) evt;
-            REPLY (": XID(0x%lx) Window(0x%lx %d,%d) Root(0x%lx %d,%d) subWindow(0x%lx)",
-                stuff->deviceid,
-                stuff->window,
+            REPLY (": XID(0x%x) Window(0x%x %d,%d) Root(0x%x %d,%d) subWindow(0x%x)",
+                (unsigned int)stuff->deviceid,
+                (unsigned int)stuff->window,
                 stuff->x,
                 stuff->y,
-                stuff->root,
+                (unsigned int)stuff->root,
                 stuff->x_root,
                 stuff->y_root,
-                stuff->subwindow);
+                (unsigned int)stuff->subwindow);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -791,15 +791,15 @@ _EvlogEventXinput (EvlogInfo *evinfo, int first_base, int detail_level, char *re
     case XI_DeviceMotionNotify:
         {
             XDeviceMotionEvent *stuff = (XDeviceMotionEvent *) evt;
-            REPLY (": XID(0x%lx) Window(0x%lx %d,%d) Root(0x%lx %d,%d) subWindow(0x%lx)",
-                stuff->deviceid,
-                stuff->window,
+            REPLY (": XID(0x%x) Window(0x%x %d,%d) Root(0x%x %d,%d) subWindow(0x%x)",
+                (unsigned int)stuff->deviceid,
+                (unsigned int)stuff->window,
                 stuff->x,
                 stuff->y,
-                stuff->root,
+                (unsigned int)stuff->root,
                 stuff->x_root,
                 stuff->y_root,
-                stuff->subwindow);
+                (unsigned int)stuff->subwindow);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -820,9 +820,9 @@ _EvlogEventXinput (EvlogInfo *evinfo, int first_base, int detail_level, char *re
     case XI_DeviceFocusIn:
         {
             XDeviceFocusInEvent *stuff = (XDeviceFocusInEvent *) evt;
-            REPLY (": XID(0x%lx) Window(0x%lx)",
-                stuff->deviceid,
-                stuff->window);
+            REPLY (": XID(0x%x) Window(0x%x)",
+                (unsigned int)stuff->deviceid,
+                (unsigned int)stuff->window);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -863,9 +863,9 @@ _EvlogEventXinput (EvlogInfo *evinfo, int first_base, int detail_level, char *re
     case XI_DeviceFocusOut:
         {
             XDeviceFocusOutEvent *stuff = (XDeviceFocusOutEvent *) evt;
-            REPLY (": XID(0x%lx) Window(0x%lx)",
-                stuff->deviceid,
-                stuff->window);
+            REPLY (": XID(0x%x) Window(0x%x)",
+                (unsigned int)stuff->deviceid,
+                (unsigned int)stuff->window);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -906,15 +906,15 @@ _EvlogEventXinput (EvlogInfo *evinfo, int first_base, int detail_level, char *re
     case XI_ProximityIn:
         {
             XProximityInEvent *stuff = (XProximityInEvent *) evt;
-            REPLY (": XID(0x%lx) Window(0x%lx %d,%d) Root(0x%lx %d,%d) subWindow(0x%lx)",
-                stuff->deviceid,
-                stuff->window,
+            REPLY (": XID(0x%x) Window(0x%x %d,%d) Root(0x%x %d,%d) subWindow(0x%x)",
+                (unsigned int)stuff->deviceid,
+                (unsigned int)stuff->window,
                 stuff->x,
                 stuff->y,
-                stuff->root,
+                (unsigned int)stuff->root,
                 stuff->x_root,
                 stuff->y_root,
-                stuff->subwindow);
+                (unsigned int)stuff->subwindow);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -934,15 +934,15 @@ _EvlogEventXinput (EvlogInfo *evinfo, int first_base, int detail_level, char *re
     case XI_ProximityOut:
         {
             XProximityOutEvent *stuff = (XProximityOutEvent *) evt;
-            REPLY (": XID(0x%lx) Window(0x%lx %d,%d) Root(0x%lx %d,%d) subWindow(0x%lx)",
-                stuff->deviceid,
-                stuff->window,
+            REPLY (": XID(0x%x) Window(0x%x %d,%d) Root(0x%x %d,%d) subWindow(0x%x)",
+                (unsigned int)stuff->deviceid,
+                (unsigned int)stuff->window,
                 stuff->x,
                 stuff->y,
-                stuff->root,
+                (unsigned int)stuff->root,
                 stuff->x_root,
                 stuff->y_root,
-                stuff->subwindow);
+                (unsigned int)stuff->subwindow);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -962,9 +962,9 @@ _EvlogEventXinput (EvlogInfo *evinfo, int first_base, int detail_level, char *re
     case XI_DeviceStateNotify:
         {
             XDeviceStateNotifyEvent *stuff = (XDeviceStateNotifyEvent *) evt;
-            REPLY (": XID(0x%lx) Window(0x%lx)",
-                stuff->deviceid,
-                stuff->window);
+            REPLY (": XID(0x%x) Window(0x%x)",
+                (unsigned int)stuff->deviceid,
+                (unsigned int)stuff->window);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -979,9 +979,9 @@ _EvlogEventXinput (EvlogInfo *evinfo, int first_base, int detail_level, char *re
     case XI_DeviceMappingNotify:
         {
             XDeviceMappingEvent *stuff = (XDeviceMappingEvent *) evt;
-            REPLY (": XID(0x%lx) Window(0x%lx)",
-                stuff->deviceid,
-                stuff->window);
+            REPLY (": XID(0x%x) Window(0x%x)",
+                (unsigned int)stuff->deviceid,
+                (unsigned int)stuff->window);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -1009,9 +1009,9 @@ _EvlogEventXinput (EvlogInfo *evinfo, int first_base, int detail_level, char *re
     case XI_ChangeDeviceNotify:
         {
             XChangeDeviceNotifyEvent *stuff = (XChangeDeviceNotifyEvent *) evt;
-            REPLY (": XID(0x%lx) Window(0x%lx)",
-                stuff->deviceid,
-                stuff->window);
+            REPLY (": XID(0x%x) Window(0x%x)",
+                (unsigned int)stuff->deviceid,
+                (unsigned int)stuff->window);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -1152,9 +1152,9 @@ _EvlogReplyXinput (EvlogInfo *evinfo, int detail_level, char *reply, int *len)
             if (evinfo->rep.isStart)
             {
                 xGetDeviceFocusReply *stuff = (xGetDeviceFocusReply *) rep;
-                REPLY (": XID(0x%lx) Time(0x%lx)",
-                    stuff->focus,
-                    stuff->time);
+                REPLY (": XID(0x%x) Time(0x%x)",
+                    (unsigned int)stuff->focus,
+                    (unsigned int)stuff->time);
             }
             else
             {
index d68b7d4..c4d1ba1 100644 (file)
@@ -70,8 +70,8 @@ _EvlogRequestXv(EvlogInfo *evinfo, int detail_level, char *reply, int *len)
     case xv_GrabPort:
         {
             xvGrabPortReq *stuff = (xvGrabPortReq *)req;
-            REPLY (": XID(0x%lx)",
-                stuff->port);
+            REPLY (": XID(0x%x)",
+                (unsigned int)stuff->port);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -85,8 +85,8 @@ _EvlogRequestXv(EvlogInfo *evinfo, int detail_level, char *reply, int *len)
     case xv_UngrabPort:
         {
             xvUngrabPortReq *stuff = (xvUngrabPortReq *)req;
-            REPLY (": XID(0x%lx)",
-                stuff->port);
+            REPLY (": XID(0x%x)",
+                (unsigned int)stuff->port);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -100,10 +100,10 @@ _EvlogRequestXv(EvlogInfo *evinfo, int detail_level, char *reply, int *len)
     case xv_PutStill:
         {
             xvPutStillReq *stuff = (xvPutStillReq *)req;
-            REPLY (": XID(0x%lx) Drawable(0x%lx) GC(0x%lx) Vid(%d,%d %dx%d) Drw(%d,%d %dx%d)",
-                stuff->port,
-                stuff->drawable,
-                stuff->gc,
+            REPLY (": XID(0x%x) Drawable(0x%x) GC(0x%x) Vid(%d,%d %dx%d) Drw(%d,%d %dx%d)",
+                (unsigned int)stuff->port,
+                (unsigned int)stuff->drawable,
+                (unsigned int)stuff->gc,
                 stuff->vid_x,
                 stuff->vid_y,
                 stuff->vid_w,
@@ -119,10 +119,10 @@ _EvlogRequestXv(EvlogInfo *evinfo, int detail_level, char *reply, int *len)
     case xv_GetStill:
         {
             xvGetStillReq *stuff = (xvGetStillReq *)req;
-            REPLY (": XID(0x%lx) Drawable(0x%lx) GC(0x%lx) Vid(%d,%d %dx%d) Drw(%d,%d %dx%d)",
-                stuff->port,
-                stuff->drawable,
-                stuff->gc,
+            REPLY (": XID(0x%x) Drawable(0x%x) GC(0x%x) Vid(%d,%d %dx%d) Drw(%d,%d %dx%d)",
+                (unsigned int)stuff->port,
+                (unsigned int)stuff->drawable,
+                (unsigned int)stuff->gc,
                 stuff->vid_x,
                 stuff->vid_y,
                 stuff->vid_w,
@@ -138,10 +138,10 @@ _EvlogRequestXv(EvlogInfo *evinfo, int detail_level, char *reply, int *len)
     case xv_PutVideo:
         {
             xvPutVideoReq *stuff = (xvPutVideoReq *)req;
-            REPLY (": XID(0x%lx) Drawable(0x%lx) GC(0x%lx) Vid(%d,%d %dx%d) Drw(%d,%d %dx%d)",
-                stuff->port,
-                stuff->drawable,
-                stuff->gc,
+            REPLY (": XID(0x%x) Drawable(0x%x) GC(0x%x) Vid(%d,%d %dx%d) Drw(%d,%d %dx%d)",
+                (unsigned int)stuff->port,
+                (unsigned int)stuff->drawable,
+                (unsigned int)stuff->gc,
                 stuff->vid_x,
                 stuff->vid_y,
                 stuff->vid_w,
@@ -157,10 +157,10 @@ _EvlogRequestXv(EvlogInfo *evinfo, int detail_level, char *reply, int *len)
     case xv_GetVideo:
         {
             xvGetVideoReq *stuff = (xvGetVideoReq *)req;
-            REPLY (": XID(0x%lx) Drawable(0x%lx) GC(0x%lx) Vid(%d,%d %dx%d) Drw(%d,%d %dx%d)",
-                stuff->port,
-                stuff->drawable,
-                stuff->gc,
+            REPLY (": XID(0x%x) Drawable(0x%x) GC(0x%x) Vid(%d,%d %dx%d) Drw(%d,%d %dx%d)",
+                (unsigned int)stuff->port,
+                (unsigned int)stuff->drawable,
+                (unsigned int)stuff->gc,
                 stuff->vid_x,
                 stuff->vid_y,
                 stuff->vid_w,
@@ -176,9 +176,9 @@ _EvlogRequestXv(EvlogInfo *evinfo, int detail_level, char *reply, int *len)
     case xv_StopVideo:
         {
             xvStopVideoReq *stuff = (xvStopVideoReq *)req;
-            REPLY (": XID(0x%lx) Drawable(0x%lx)",
-                stuff->port,
-                stuff->drawable);
+            REPLY (": XID(0x%x) Drawable(0x%x)",
+                (unsigned int)stuff->port,
+                (unsigned int)stuff->drawable);
 
             return reply;
         }
@@ -186,8 +186,8 @@ _EvlogRequestXv(EvlogInfo *evinfo, int detail_level, char *reply, int *len)
     case xv_SelectVideoNotify:
         {
             xvSelectVideoNotifyReq *stuff = (xvSelectVideoNotifyReq *)req;
-            REPLY (": XID(0x%lx)",
-                stuff->drawable);
+            REPLY (": XID(0x%x)",
+                (unsigned int)stuff->drawable);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -201,8 +201,8 @@ _EvlogRequestXv(EvlogInfo *evinfo, int detail_level, char *reply, int *len)
     case xv_SelectPortNotify:
         {
             xvSelectPortNotifyReq *stuff = (xvSelectPortNotifyReq *)req;
-            REPLY (": XID(0x%lx)",
-                stuff->port);
+            REPLY (": XID(0x%x)",
+                (unsigned int)stuff->port);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -216,8 +216,8 @@ _EvlogRequestXv(EvlogInfo *evinfo, int detail_level, char *reply, int *len)
     case xv_QueryBestSize:
         {
             xvQueryBestSizeReq *stuff = (xvQueryBestSizeReq *)req;
-            REPLY (": XID(0x%lx) VidSize(%dx%d) DrwSize(%dx%d)",
-                stuff->port,
+            REPLY (": XID(0x%x) VidSize(%dx%d) DrwSize(%dx%d)",
+                (unsigned int)stuff->port,
                 stuff->vid_w,
                 stuff->vid_h,
                 stuff->drw_w,
@@ -235,8 +235,8 @@ _EvlogRequestXv(EvlogInfo *evinfo, int detail_level, char *reply, int *len)
     case xv_SetPortAttribute:
         {
             xvSetPortAttributeReq *stuff = (xvSetPortAttributeReq *)req;
-            REPLY (": XID(0x%lx) ",
-                stuff->port);
+            REPLY (": XID(0x%x) ",
+                (unsigned int)stuff->port);
 
             REPLY (" Attribute");
             reply = xDbgGetAtom(stuff->attribute, evinfo, reply, len);
@@ -253,8 +253,8 @@ _EvlogRequestXv(EvlogInfo *evinfo, int detail_level, char *reply, int *len)
     case xv_GetPortAttribute:
         {
             xvGetPortAttributeReq *stuff = (xvGetPortAttributeReq *)req;
-            REPLY (": XID(0x%lx)",
-                stuff->port);
+            REPLY (": XID(0x%x)",
+                (unsigned int)stuff->port);
 
             REPLY (" Attribute");
             reply = xDbgGetAtom(stuff->attribute, evinfo, reply, len);
@@ -265,11 +265,11 @@ _EvlogRequestXv(EvlogInfo *evinfo, int detail_level, char *reply, int *len)
     case xv_PutImage:
         {
             xvPutImageReq *stuff = (xvPutImageReq *)req;
-            REPLY (": XID(0x%lx) Drawable(0x%lx) GC(0x%lx) ID(%lx) buf(%dx%d) src(%d,%d %dx%d) drw(%d,%d %dx%d)",
-                stuff->port,
-                stuff->drawable,
-                stuff->gc,
-                stuff->id,
+            REPLY (": XID(0x%x) Drawable(0x%x) GC(0x%x) ID(%x) buf(%dx%d) src(%d,%d %dx%d) drw(%d,%d %dx%d)",
+                (unsigned int)stuff->port,
+                (unsigned int)stuff->drawable,
+                (unsigned int)stuff->gc,
+                (unsigned int)stuff->id,
                 stuff->width,
                 stuff->height,
                 stuff->src_x,
@@ -287,11 +287,11 @@ _EvlogRequestXv(EvlogInfo *evinfo, int detail_level, char *reply, int *len)
     case xv_ShmPutImage:
         {
             xvShmPutImageReq *stuff = (xvShmPutImageReq *)req;
-            REPLY (": XID(0x%lx) Drawable(0x%lx) GC(0x%lx) ID(%lx) buf(%dx%d) src(%d,%d %dx%d) drw(%d,%d %dx%d)",
-                stuff->port,
-                stuff->drawable,
-                stuff->gc,
-                stuff->id,
+            REPLY (": XID(0x%x) Drawable(0x%x) GC(0x%x) ID(%x) buf(%dx%d) src(%d,%d %dx%d) drw(%d,%d %dx%d)",
+                (unsigned int)stuff->port,
+                (unsigned int)stuff->drawable,
+                (unsigned int)stuff->gc,
+                (unsigned int)stuff->id,
                 stuff->width,
                 stuff->height,
                 stuff->src_x,
@@ -306,9 +306,9 @@ _EvlogRequestXv(EvlogInfo *evinfo, int detail_level, char *reply, int *len)
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
                 REPLY ("\n");
-                REPLY ("%67s shmseg(0x%lx) offset(%ld) send_event(%s)",
+                REPLY ("%67s shmseg(0x%x) offset(%ld) send_event(%s)",
                     " ",
-                    stuff->shmseg,
+                    (unsigned int)stuff->shmseg,
                     stuff->offset,
                     stuff->send_event ? "YES" : "NO");
             }
@@ -333,9 +333,9 @@ _EvlogEventXv (EvlogInfo *evinfo, int first_base, int detail_level, char *reply,
     case XvVideoNotify:
         {
             XvVideoNotifyEvent *stuff = (XvVideoNotifyEvent *) evt;
-            REPLY (": XID(0x%lx) portID(0x%lx)",
-                stuff->drawable,
-                stuff->port_id);
+            REPLY (": XID(0x%x) portID(0x%x)",
+                (unsigned int)stuff->drawable,
+                (unsigned int)stuff->port_id);
 
             if (detail_level >= EVLOG_PRINT_DETAIL)
             {
@@ -351,8 +351,8 @@ _EvlogEventXv (EvlogInfo *evinfo, int first_base, int detail_level, char *reply,
     case XvPortNotify:
         {
             XvPortNotifyEvent *stuff = (XvPortNotifyEvent *) evt;
-            REPLY (": XID(0x%lx) Value(%ld)",
-                stuff->port_id,
+            REPLY (": XID(0x%x) Value(%ld)",
+                (unsigned int)stuff->port_id,
                 stuff->value);
 
             REPLY (" Attribute");
index 9df96b5..1a2f499 100644 (file)
@@ -504,20 +504,20 @@ _traceEvent (CallbackListPtr *pcbl, pointer nulldata, pointer calldata)
             {
             case KeyPress:
             case KeyRelease:
-                XDBG_SECURE (MXDBG, "%s(%d)_%d(%s.%d : %s.0x%lx) root(%d,%d) win(%d,%d)\n"
+                XDBG_SECURE (MXDBG, "%s(%d)_%d(%s.%d : %s.0x%x) root(%d,%d) win(%d,%d)\n"
                         , ename[type-KeyPress], pev->u.u.detail, pev->u.u.type
                         , info->command, info->pid
-                        , _traceGetWindowName (pClient, pev->u.keyButtonPointer.event), pev->u.keyButtonPointer.event
+                        , _traceGetWindowName (pClient, pev->u.keyButtonPointer.event), (unsigned int)pev->u.keyButtonPointer.event
                         , pev->u.keyButtonPointer.rootX, pev->u.keyButtonPointer.rootY
                         , pev->u.keyButtonPointer.eventX, pev->u.keyButtonPointer.eventY);
                 break;
 
             case ButtonPress:
             case ButtonRelease:
-                XDBG_SECURE (MXDBG, "%s(%d)_%d(%s.%d : %s.0x%lx) root(%d,%d) win(%d,%d)\n"
+                XDBG_SECURE (MXDBG, "%s(%d)_%d(%s.%d : %s.0x%x) root(%d,%d) win(%d,%d)\n"
                         , ename[type-KeyPress], pev->u.u.detail, pev->u.u.type
                         , info->command, info->pid
-                        , _traceGetWindowName (pClient, pev->u.keyButtonPointer.event), pev->u.keyButtonPointer.event
+                        , _traceGetWindowName (pClient, pev->u.keyButtonPointer.event), (unsigned int)pev->u.keyButtonPointer.event
                         , pev->u.keyButtonPointer.rootX, pev->u.keyButtonPointer.rootY
                         , pev->u.keyButtonPointer.eventX, pev->u.keyButtonPointer.eventY);
                 break;