read_len = read (fd, &Extensions_size, sizeof (int));
GOTO_IF_FAIL (read_len == sizeof (int), print_done);
+ GOTO_IF_FAIL (Extensions_size > 0, print_done);
total += read_len;
for (i = 0 ; i < Extensions_size ; i++)
ds/bool_exp_rule_checker.c \
ds/bool_exp_tokenizer.c
+if HAVE_HWC
+COMMON_SOURCE += xdbg_evlog_hwc.c
+endif
+
COMMON_CFLAGS = \
${CFLAGS} \
@XDBG_CFLAGS@ \
#ifndef __X_DEBUG_DBUS_H__
#define __X_DEBUG_DBUS_H__
-#define XDBG_DBUS_SERVER "org.x.dbg.server"
#define XDBG_DBUS_INTERFACE "org.x.dbg.interface"
-#define XDBG_DBUS_PATH "/org/x/dbg/path"
#define XDBG_DBUS_CLIENT "org.x.dbg.client"
#define XDBG_DBUS_METHOD "x_dbg_method"
char reqname[STR_LEN];
char client[STR_LEN];
int pid;
+ char xdbg_dbus_server[STR_LEN];
+ char xdbg_dbus_path[STR_LEN];
};
static DBusHandlerResult
{
DBusError err;
int ret;
+ char *display_num;
+
+ if(!(display_num = getenv("DISPLAY")))
+ {
+ XDBG_LOG ("[CLIENT:%s] failed: get DISPLAY ENV\n", info->client);
+ return FALSE;
+ }
+
+ snprintf(info->xdbg_dbus_server, sizeof(info->xdbg_dbus_path), "org.x.dbg.server%d", atoi(display_num));
+ snprintf(info->xdbg_dbus_path, sizeof(info->xdbg_dbus_path), "/org/x/dbg/path/%d", atoi(display_num));
+
+ XDBG_LOG ("[CLIENT:%s] display number :%d\n", info->client, atoi(display_num));
dbus_error_init (&err);
RETURN_VAL_IF_FAIL (info->conn == NULL, FALSE);
dbus_error_init (&err);
- msg = dbus_message_new_method_call (XDBG_DBUS_SERVER, XDBG_DBUS_PATH,
+ msg = dbus_message_new_method_call (info->xdbg_dbus_server, info->xdbg_dbus_path,
XDBG_DBUS_INTERFACE, XDBG_DBUS_METHOD);
GOTO_IF_FAIL (msg != NULL, err_send);
#define RECONNECT_TIME 1000
#define DISPATCH_TIME 50
+extern _X_EXPORT char *display;
+
typedef struct _XDbgDBusServerInfo
{
OsTimerPtr timer;
XDbgDbusServerMethod *methods;
char rule[STR_LEN];
int fd;
+ char xdbg_dbus_server[STR_LEN];
+ char xdbg_dbus_path[STR_LEN];
} XDbgDBusServerInfo;
static XDbgDBusServerInfo server_info;
XDBG_RETURN_VAL_IF_FAIL (info->conn == NULL, FALSE);
+ snprintf(info->xdbg_dbus_server, sizeof(info->xdbg_dbus_server), "org.x.dbg.server%d", atoi(display));
+ snprintf(info->xdbg_dbus_path, sizeof(info->xdbg_dbus_path), "/org/x/dbg/path/%d", atoi(display));
+
+ XDBG_DEBUG (MDBUS, "[SERVER] display number %d\n", atoi(display));
+
info->conn = dbus_bus_get (DBUS_BUS_SYSTEM, &err);
if (dbus_error_is_set (&err))
{
goto free_err;
}
- ret = dbus_bus_request_name (info->conn, XDBG_DBUS_SERVER,
+ ret = dbus_bus_request_name (info->conn, info->xdbg_dbus_server,
DBUS_NAME_FLAG_REPLACE_EXISTING , &err);
if (dbus_error_is_set (&err))
{
}
if (!dbus_connection_register_object_path (info->conn,
- XDBG_DBUS_PATH, &vtable,
+ info->xdbg_dbus_path, &vtable,
info))
{
XDBG_ERROR (MDBUS, "[SERVER] failed: register object path\n");
free_filter:
dbus_connection_remove_filter (info->conn, _xDbgDBusServerMsgFilter, info);
free_register:
- dbus_connection_unregister_object_path (info->conn, XDBG_DBUS_PATH);
+ dbus_connection_unregister_object_path (info->conn, info->xdbg_dbus_path);
free_match:
dbus_bus_remove_match (info->conn, info->rule, &err);
dbus_error_free (&err);
free_name:
- dbus_bus_release_name (info->conn, XDBG_DBUS_SERVER, &err);
+ dbus_bus_release_name (info->conn, info->xdbg_dbus_server, &err);
dbus_error_free (&err);
free_conn:
dbus_connection_close (info->conn);
DBusError err;
dbus_error_init (&err);
dbus_connection_remove_filter (info->conn, _xDbgDBusServerMsgFilter, info);
- dbus_connection_unregister_object_path (info->conn, XDBG_DBUS_PATH);
+ dbus_connection_unregister_object_path (info->conn, info->xdbg_dbus_path);
dbus_bus_remove_match (info->conn, info->rule, &err);
dbus_error_free (&err);
- dbus_bus_release_name (info->conn, XDBG_DBUS_SERVER, &err);
+ dbus_bus_release_name (info->conn, info->xdbg_dbus_server, &err);
dbus_error_free (&err);
dbus_connection_unref (info->conn);
info->conn = NULL;
**************************************************************************/
+#include <config.h>
+
#include <stdio.h>
#include <string.h>
#include <strings.h>
if (!xDbgEvlogReadRuleFile(argv[1], reply, len))
return FALSE;
rulechecker_print_rule (rc, reply, len);
-
+
return TRUE;
}
else if (!_strcasecmp (command, "print"))
pfs += (strlen(new_argv[2]) + 1);
-
if(!xDbgEvlogRuleSet ((const int) new_argc, (const char**) new_argv, reply, len))
{
+ if (fd >= 0)
+ close (fd);
+
return FALSE;
}
-
}
if (fd >= 0)
return TRUE;
}
-
ExtensionInfo Evlog_extensions[] = {
{xDbgEvlogCompositeGetBase, 0, 0, 0, NULL, NULL},
{xDbgEvlogDamageGetBase, 0, 0, 0, NULL, NULL},
{xDbgEvlogXextXtestGetBase, 0, 0, 0, NULL, NULL},
{xDbgEvlogXextXtestExt1GetBase, 0, 0, 0, NULL, NULL},
{xDbgEvlogXextShapeGetBase, 0, 0, 0, NULL, NULL},
- {xDbgEvlogXvGetBase, 0, 0, 0, NULL, NULL}
+ {xDbgEvlogXvGetBase, 0, 0, 0, NULL, NULL},
+#if HAVE_HWC
+ {xDbgEvlogHwcGetBase, 0, 0, 0, NULL, NULL},
+#endif
};
+
ExtensionInfo* Sorted_Evlog_extensions;
int Extensions_size = 0;
else
REPLY ("[%10.3f][%5ld] %22s(%2d:%5d) %s %7s ",
evinfo->time / 1000.0,
- evinfo->time - prev,
+ (long int)evinfo->time - prev,
xDbgEvlogGetCmd (evinfo->client.command),
evinfo->client.index,
evinfo->client.pid,
}
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);
}
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++;
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++;
}
#ifndef __XDBG_EVLOG_H__
#define __XDBG_EVLOG_H__
+#include <config.h>
+
#include "xdbg_types.h"
#include "xdbg_evlog_request.h"
#include "xdbg_evlog_event.h"
#include "xdbg_evlog_randr.h"
#include "xdbg_evlog_xinput.h"
#include "xdbg_evlog_xv.h"
+#if HAVE_HWC
+#include "xdbg_evlog_hwc.h"
+#endif
#include <list.h>
#include <windowstr.h>
#include <X11/extensions/Xcomposite.h>
#include <X11/extensions/compositeproto.h>
+#include <X11/extensions/composite.h>
#include "xdbg_types.h"
#include "xdbg_evlog_composite.h"
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)
{
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)
{
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)
{
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)
{
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;
}
+#ifdef _F_INPUT_REDIRECTION_
+ case X_CompositeSetCoordinateTransform:
+ {
+ xCompositeSetCoordinateTransformReq *stuff = (xCompositeSetCoordinateTransformReq *)req;
+ REPLY (": XID(0x%x) (%.3f,%.3f,%.3f) (%.3f,%.3f,%.3f) (%.3f,%.3f,%.3f)",
+ (unsigned int)stuff->window,
+ (float)pixman_fixed_to_double(stuff->transform.matrix11), (float)pixman_fixed_to_double(stuff->transform.matrix12), (float)pixman_fixed_to_double(stuff->transform.matrix13),
+ (float)pixman_fixed_to_double(stuff->transform.matrix21), (float)pixman_fixed_to_double(stuff->transform.matrix22), (float)pixman_fixed_to_double(stuff->transform.matrix23),
+ (float)pixman_fixed_to_double(stuff->transform.matrix31), (float)pixman_fixed_to_double(stuff->transform.matrix32), (float)pixman_fixed_to_double(stuff->transform.matrix33));
+
+ return reply;
+ }
+#endif
+
default:
break;
}
{
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,
switch (stuff->visual)
{
case CopyFromParent: visual = "CopyFromParent"; break;
- default: visual = dvisual; snprintf (dvisual, 10, "0x%lx", stuff->visual); break;
+ default: visual = dvisual; snprintf (dvisual, 10, "0x%x", (unsigned int)stuff->visual); break;
}
switch (stuff->class)
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)
{
- \r REPLY (" value_mask");
+ \r REPLY (" detail");
\r REPLY ("(");
reply = _getWindowAttributeMask(stuff->valueMask, reply, len);
+ if (stuff->valueMask == CWEventMask)
+
+ REPLY (", mask(%x)", (unsigned int)*((XID *)&stuff[1]));
\r REPLY (")");
}
{
xChangeSaveSetReq *stuff = (xChangeSaveSetReq *)req;
- REPLY (": XID(0x%lx)",
- stuff->window);
+ REPLY (": XID(0x%x)",
+ (unsigned int)stuff->window);
if (detail_level >= EVLOG_PRINT_DETAIL)
{
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);
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)
{
{
xCirculateWindowReq *stuff = (xCirculateWindowReq *)req;
- REPLY (": XID(0x%lx)",
- stuff->window);
+ REPLY (": XID(0x%x)",
+ (unsigned int)stuff->window);
if (detail_level >= EVLOG_PRINT_DETAIL)
{
{
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);
" ",
mode,
stuff->format,
- stuff->nUnits);
+ (long int)stuff->nUnits);
}
return reply;
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);
{
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);
REPLY ("%67s delete(%s) longOffset(%ld) longLength(%ld)",
" ",
stuff->delete ? "YES" : "NO",
- stuff->longOffset,
- stuff->longLength);
+ (long int)stuff->longOffset,
+ (long int)stuff->longLength);
}
return reply;
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);
if (detail_level >= EVLOG_PRINT_DETAIL)
{
REPLY (" time(%lums)",
- stuff->time);
+ (unsigned long)stuff->time);
}
return reply;
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);
if (detail_level >= EVLOG_PRINT_DETAIL)
{
REPLY (" time(%lums)",
- stuff->time);
+ (unsigned long)stuff->time);
}
return reply;
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)
{
{
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)
{
REPLY (" pointer_mode(%s) keyboard_mode(%s) time(%lums)\n",
pointer_mode,
keyboard_mode,
- stuff->time);
+ (unsigned long)stuff->time);
REPLY (" event_mask");
REPLY ("(");
{
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)
{
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)
{
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)
{
REPLY (" time(%lums)",
- stuff->time);
+ (unsigned long)stuff->time);
REPLY (" event_mask");
REPLY ("(");
{
xGrabKeyboardReq *stuff = (xGrabKeyboardReq *)req;
- REPLY (": XID(0x%lx)",
- stuff->grabWindow);
+ REPLY (": XID(0x%x)",
+ (unsigned int)stuff->grabWindow);
if (detail_level >= EVLOG_PRINT_DETAIL)
{
{
xGrabKeyReq *stuff = (xGrabKeyReq *)req;
- REPLY (": XID(0x%lx)",
- stuff->grabWindow);
+ REPLY (": XID(0x%x)",
+ (unsigned int)stuff->grabWindow);
if (detail_level >= EVLOG_PRINT_DETAIL)
{
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)
{
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)
{
REPLY (" reverTo(%d) time(%lums)",
stuff->revertTo,
- stuff->time);
+ (unsigned long)stuff->time);
}
return reply;
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);
return reply;
}
+ case X_CreateGC:
+ {
+ xCreateGCReq *stuff = (xCreateGCReq *)req;
+ REPLY (": Gc(0x%x) Drawable(0x%x)",
+ (unsigned int)stuff->gc,
+ (unsigned int)stuff->drawable);
+
+ return reply;
+ }
+
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,
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,
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,
if (detail_level >= EVLOG_PRINT_DETAIL)
{
- REPLY (" bit_plane(0x%lx)",
- stuff->bitPlane);
+ REPLY (" bit_plane(0x%x)",
+ (unsigned int)stuff->bitPlane);
}
return reply;
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)
{
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)
{
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;
}
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;
}
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;
}
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)
{
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;
}
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;
}
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,
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,
default: format = dformat; snprintf (dformat, 10, "%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;
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);
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);
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);
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);
case X_UngrabKeyboard:
case X_FreePixmap:
case X_KillClient:
+ case X_FreeGC:
{
xResourceReq *stuff = (xResourceReq *)req;
- REPLY (": XID(0x%lx)",
- stuff->id);
+ REPLY (": XID(0x%x)",
+ (unsigned int)stuff->id);
return reply;
}
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)
{
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)
{
REPLY ("\n");
REPLY ("%67s time(%lums) state(0x%x) same_screen(%s) focus(%s)",
" ",
- evt->u.enterLeave.time,
+ (unsigned long)evt->u.enterLeave.time,
evt->u.enterLeave.state,
evt->u.enterLeave.flags & ELFlagSameScreen ? "YES" : "NO",
evt->u.enterLeave.flags & ELFlagFocus ? "YES" : "NO");
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)
{
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,
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,
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)
{
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)
{
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,
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)
{
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)
{
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);
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,
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,
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);
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);
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)
{
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);
REPLY ("\n");
REPLY ("%67s time(%lums) state(%s)",
" ",
- evt->u.property.time,
+ (unsigned long)evt->u.property.time,
state);
}
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);
if (detail_level >= EVLOG_PRINT_DETAIL)
{
REPLY (" time(%lums)",
- evt->u.selectionClear.time);
+ (unsigned long)evt->u.selectionClear.time);
}
return reply;
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);
if (detail_level >= EVLOG_PRINT_DETAIL)
{
REPLY (" time(%lums)",
- evt->u.selectionRequest.time);
+ (unsigned long)evt->u.selectionRequest.time);
}
return reply;
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);
if (detail_level >= EVLOG_PRINT_DETAIL)
{
REPLY (" time(%lums)",
- evt->u.selectionNotify.time);
+ (unsigned long)evt->u.selectionNotify.time);
}
return reply;
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)
{
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);
{
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,
{
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
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 (", ");
}
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);
+ (long int)stuff->nItems);
}
else
{
{
xGetImageReply *stuff = (xGetImageReply *)rep;
- REPLY (": XID(0x%lx)",
- stuff->visual);
+ REPLY (": XID(0x%x)",
+ (unsigned int)stuff->visual);
}
else
{
}
return reply;
-}
+}
\ No newline at end of file
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)
{
case X_DamageDestroy:
{
xDamageDestroyReq *stuff = (xDamageDestroyReq *)req;
- REPLY (": XID(0x%lx)",
- stuff->damage);
+ REPLY (": XID(0x%x)",
+ (unsigned int)stuff->damage);
return reply;
}
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,
REPLY ("\n");
REPLY ("%67s time(%lums) level(%d) sequence_num(%d)",
" ",
- stuff->timestamp,
+ (unsigned long)stuff->timestamp,
stuff->level,
stuff->sequenceNumber);
}
case X_DRI2CreateDrawable:
{
xDRI2CreateDrawableReq *stuff = (xDRI2CreateDrawableReq *)req;
- REPLY (": XID(0x%lx)",
- stuff->drawable);
+ REPLY (": XID(0x%x)",
+ (unsigned int)stuff->drawable);
return reply;
}
case X_DRI2DestroyDrawable:
{
xDRI2DestroyDrawableReq *stuff = (xDRI2DestroyDrawableReq *)req;
- REPLY (": XID(0x%lx)",
- stuff->drawable);
+ REPLY (": XID(0x%x)",
+ (unsigned int)stuff->drawable);
return reply;
}
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)
{
REPLY (" count(%ld)",
- stuff->count);
+ (long int)stuff->count);
}
return reply;
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)
{
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)
{
REPLY (" count(%ld)",
- stuff->count);
+ (long int)stuff->count);
}
return reply;
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;
}
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)
{
REPLY (" interval(%ld)",
- stuff->interval);
+ (long int)stuff->interval);
}
return reply;
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)
{
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);
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)
{
{
xDRI2GetBuffersReply *stuff = (xDRI2GetBuffersReply *)rep;
REPLY (": size(%ldx%ld) count(%ld)",
- stuff->width,
- stuff->height,
- stuff->count);
+ (long int)stuff->width,
+ (long int)stuff->height,
+ (long int)stuff->count);
if (detail_level >= EVLOG_PRINT_DETAIL)
{
{
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;
{
xDRI2SwapBuffersReply *stuff = (xDRI2SwapBuffersReply *)rep;
REPLY (": swap(%ld/%ld)",
- stuff->swap_hi,
- stuff->swap_lo);
+ (long int)stuff->swap_hi,
+ (long int)stuff->swap_lo);
if (detail_level >= EVLOG_PRINT_DETAIL)
{
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;
case X_GestureGetSelectedEvents:
{
xGestureGetSelectedEventsReq *stuff = (xGestureGetSelectedEventsReq *)req;
- REPLY (": XID(0x%lx)",
- stuff->window);
+ REPLY (": XID(0x%x)",
+ (unsigned int)stuff->window);
return reply;
}
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)
{
case GestureNotifyTapNHold: event_type = "GestureNotifyTapNHold"; break;
case GestureNotifyHold: event_type = "GestureNotifyHold"; break;
case GestureNotifyGroup: event_type = "GestureNotifyGroup"; break;
- default: event_type = devent_type; snprintf (devent_type, 10, "%ld", stuff->eventType); break;
+ default: event_type = devent_type; sprintf (devent_type, "%ld", (long int)stuff->eventType); break;
}
REPLY (" event_type(%s) num_finger(%d) time(%lums)",
event_type,
stuff->num_finger,
- stuff->time);
+ (unsigned long)stuff->time);
}
return reply;
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)
{
case GestureNotifyTapNHold: event_type = "GestureNotifyTapNHold"; break;
case GestureNotifyHold: event_type = "GestureNotifyHold"; break;
case GestureNotifyGroup: event_type = "GestureNotifyGroup"; break;
- default: event_type = devent_type; snprintf (devent_type, 10, "%ld", stuff->eventType); break;
+ default: event_type = devent_type; sprintf (devent_type, "%ld", (long int)stuff->eventType); break;
}
REPLY (" event_type(%s) num_finger(%d) time(%lums)",
event_type,
stuff->num_finger,
- stuff->time);
+ (unsigned long)stuff->time);
}
return reply;
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)
{
REPLY (" kind(%s) time(%lums) num_finger(%d) direction(%d) distance(%d)",
kind,
- stuff->time,
+ (unsigned long)stuff->time,
stuff->num_finger,
stuff->direction,
stuff->distance);
REPLY ("\n");
REPLY ("%67s duration(%lums) angle(%ld)",
" ",
- stuff->duration,
- stuff->angle);
+ (unsigned long)stuff->duration,
+ (long int)stuff->angle);
}
return reply;
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)
{
REPLY (" kind(%s) sequence_num(%d) time(%lums) num_finger(%d) direction(%d) ",
kind,
stuff->sequenceNumber,
- stuff->time,
+ (unsigned long)stuff->time,
stuff->num_finger,
stuff->direction);
REPLY ("%67s distance(%d) duration(%ldms) coord(%d,%d)",
" ",
stuff->distance,
- stuff->duration,
+ (long int)stuff->duration,
stuff->dx,
stuff->dy);
}
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)
{
REPLY (" kind(%s) sequence_num(%d) time(%lums) num_finger(%d) distance(%d)",
kind,
stuff->sequenceNumber,
- stuff->time,
+ (unsigned long)stuff->time,
stuff->num_finger,
stuff->distance);
" ",
stuff->cx,
stuff->cy,
- stuff->zoom,
- stuff->angle);
+ (long int)stuff->zoom,
+ (long int)stuff->angle);
}
return reply;
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)
{
REPLY (" kind(%s) sequence_num(%d) time(%lums) num_finger(%d) coord(%d,%d)",
kind,
stuff->sequenceNumber,
- stuff->time,
+ (unsigned long)stuff->time,
stuff->num_finger,
stuff->cx,
stuff->cy);
REPLY ("%67s tap_repeat(%d) interval(%lums)",
" ",
stuff->tap_repeat,
- stuff->interval);
+ (unsigned long)stuff->interval);
}
return reply;
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)
{
REPLY (" kind(%s) sequence_num(%d) time(%lums) num_finger(%d) coord(%d,%d)",
kind,
stuff->sequenceNumber,
- stuff->time,
+ (unsigned long)stuff->time,
stuff->num_finger,
stuff->cx,
stuff->cy);
REPLY ("\n");
REPLY ("%67s interval(%lums) hold_time(%lums)",
" ",
- stuff->interval,
- stuff->holdtime);
+ (unsigned long)stuff->interval,
+ (unsigned long)stuff->holdtime);
}
return reply;
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)
{
REPLY (" kind(%s) sequence_num(%d) time(%lums) num_finger(%d) coord(%d,%d) ",
kind,
stuff->sequenceNumber,
- stuff->time,
+ (unsigned long)stuff->time,
stuff->num_finger,
stuff->cx,
stuff->cy);
REPLY ("\n");
REPLY ("%67s hold_time(%lums)",
" ",
- stuff->holdtime);
+ (unsigned long)stuff->holdtime);
}
return reply;
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);
" ",
kind,
stuff->sequenceNumber,
- stuff->time,
+ (unsigned long)stuff->time,
stuff->groupid,
stuff->num_group);
}
--- /dev/null
+/**************************************************************************
+
+xdbg
+
+Copyright (c) 2013 Samsung Electronics Co., Ltd All Rights Reserved
+
+Contact: Boram Park <boram1288.park@samsung.com>
+ Sangjin LEE <lsj119@samsung.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sub license, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice (including the
+next paragraph) shall be included in all copies or substantial portions
+of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
+ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+**************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdio.h>
+#include <string.h>
+#include <strings.h>
+#include <sys/types.h>
+#include <sys/fcntl.h>
+#include <unistd.h>
+#include <stdarg.h>
+#include <fcntl.h>
+#include <unistd.h>
+
+#include <dix.h>
+#define XREGISTRY
+#include <registry.h>
+#include <xace.h>
+#include <xacestr.h>
+#include <X11/Xatom.h>
+#include <X11/Xlib.h>
+#include <windowstr.h>
+#include <X11/extensions/hwcproto.h>
+#include <X11/extensions/hwc.h>
+
+#include "xdbg_types.h"
+#include "xdbg_evlog_hwc.h"
+#include "xdbg_evlog.h"
+
+static char *
+_EvlogRequestHwc (EvlogInfo *evinfo, int detail_level, char *reply, int *len)
+{
+ xReq *req = evinfo->req.ptr;
+ int i;
+ CARD32 *p;
+
+ switch (req->data)
+ {
+ case X_HWCOpen:
+ {
+ xHWCOpenReq *stuff = (xHWCOpenReq *)req;
+ REPLY (": XID(0x%x)",
+ (unsigned int)stuff->window);
+
+ return reply;
+ }
+
+ case X_HWCSetDrawables:
+ {
+ xHWCSetDrawablesReq *stuff = (xHWCSetDrawablesReq *)req;
+ REPLY (": XID(0x%x) count(%ld)",
+ (unsigned int)stuff->window, stuff->count);
+
+ p = (CARD32 *) & req[3];
+ REPLY (" Drawables(");
+ for (i = 0; i < stuff->count; i++)
+ REPLY (" 0x%x", (unsigned int)p[i]);
+ REPLY (" )");
+
+
+ return reply;
+ }
+
+ default:
+ break;
+ }
+
+ return reply;
+}
+
+
+static char *
+_EvlogEventHwc (EvlogInfo *evinfo, int first_base, int detail_level, char *reply, int *len)
+{
+ xGenericEvent *evt = (xGenericEvent *)evinfo->evt.ptr;
+
+ switch (evt->evtype)
+ {
+ case HWCConfigureNotify:
+ {
+ xHWCConfigureNotify *stuff = (xHWCConfigureNotify *) evt;
+ REPLY (": maxLayer(%d)",
+ (unsigned int)stuff->maxLayer);
+
+ return reply;
+ }
+
+ default:
+ break;
+ }
+
+ return reply;
+}
+
+static char *
+_EvlogReplyHwc (EvlogInfo *evinfo, int detail_level, char *reply, int *len)
+{
+ xGenericReply *rep = evinfo->rep.ptr;
+
+ switch (evinfo->rep.reqData)
+ {
+ case X_HWCOpen:
+ {
+ if (evinfo->rep.isStart)
+ {
+ xHWCOpenReply *stuff = (xHWCOpenReply *)rep;
+ REPLY (": maxLayers(%d)",
+ (unsigned int)stuff->maxLayer);
+ }
+
+ return reply;
+ }
+
+ default:
+ break;
+ }
+
+ return reply;
+}
+
+void
+xDbgEvlogHwcGetBase (ExtensionInfo *extinfo)
+{
+#ifdef XDBG_CLIENT
+ RETURN_IF_FAIL (extinfo != NULL);
+
+ extinfo->req_func = _EvlogRequestHwc;
+ extinfo->evt_func = _EvlogEventHwc;
+ extinfo->rep_func = _EvlogReplyHwc;
+#else
+ ExtensionEntry *xext = CheckExtension (HWC_NAME);
+ RETURN_IF_FAIL (xext != NULL);
+ RETURN_IF_FAIL (extinfo != NULL);
+
+ extinfo->opcode = xext->base;
+ extinfo->evt_base = xext->eventBase;
+ extinfo->err_base = xext->errorBase;
+ extinfo->req_func = _EvlogRequestHwc;
+ extinfo->evt_func = _EvlogEventHwc;
+ extinfo->rep_func = _EvlogReplyHwc;
+#endif
+}
--- /dev/null
+/**************************************************************************
+
+xdbg
+
+Copyright (c) 2013 Samsung Electronics Co., Ltd All Rights Reserved
+
+Contact: Boram Park <boram1288.park@samsung.com>
+ Sangjin LEE <lsj119@samsung.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sub license, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice (including the
+next paragraph) shall be included in all copies or substantial portions
+of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
+ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+**************************************************************************/
+
+#ifndef __XDBG_EVLOG_HWC_H__
+#define __XDBG_EVLOG_HWC_H__
+
+#include "xdbg_types.h"
+
+void xDbgEvlogHwcGetBase (ExtensionInfo *extinfo);
+
+#endif
case X_RRGetScreenSizeRange:
{
xRRGetScreenSizeRangeReq *stuff = (xRRGetScreenSizeRangeReq *)req;
- REPLY (": XID(0x%lx)",
- stuff->window);
+ REPLY (": XID(0x%x)",
+ (unsigned int)stuff->window);
return reply;
}
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);
if (detail_level >= EVLOG_PRINT_DETAIL)
{
REPLY (" milliSize(%ldx%ld)",
- stuff->widthInMillimeters,
- stuff->heightInMillimeters);
+ (long int)stuff->widthInMillimeters,
+ (long int)stuff->heightInMillimeters);
}
return reply;
case X_RRGetScreenResources:
{
xRRGetScreenResourcesReq *stuff = (xRRGetScreenResourcesReq *)req;
- REPLY (": XID(0x%lx)",
- stuff->window);
+ REPLY (": XID(0x%x)",
+ (unsigned int)stuff->window);
return reply;
}
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)
{
REPLY (" config_timestamp(%lums)",
- stuff->configTimestamp);
+ (unsigned long)stuff->configTimestamp);
}
return reply;
case X_RRListOutputProperties:
{
xRRListOutputPropertiesReq *stuff = (xRRListOutputPropertiesReq *)req;
- REPLY (": XID(0x%lx)",
- stuff->output);
+ REPLY (": XID(0x%x)",
+ (unsigned int)stuff->output);
return reply;
}
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);
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);
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);
" ",
mode,
stuff->format,
- stuff->nUnits);
+ (long int)stuff->nUnits);
}
return reply;
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);
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);
if (detail_level >= EVLOG_PRINT_DETAIL)
{
REPLY (" longOffset(%ld) longLength(%ld)",
- stuff->longOffset,
- stuff->longLength);
+ (long int)stuff->longOffset,
+ (long int)stuff->longLength);
}
return reply;
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)
{
REPLY (" config_timestamp(%lums)",
- stuff->configTimestamp);
+ (unsigned long)stuff->configTimestamp);
}
return reply;
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);
}
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 long)stuff->timestamp,
+ (unsigned long)stuff->configTimestamp,
+ (unsigned int)stuff->mode,
rotation);
}
case X_RRGetScreenResourcesCurrent:
{
xRRGetScreenResourcesCurrentReq *stuff = (xRRGetScreenResourcesCurrentReq *)req;
- REPLY (": XID(0x%lx)",
- stuff->window);
+ REPLY (": XID(0x%x)",
+ (unsigned int)stuff->window);
return reply;
}
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)
{
" ",
rotation,
stuff->sequenceNumber,
- stuff->timestamp,
- stuff->configTimestamp);
+ (unsigned long)stuff->timestamp,
+ (unsigned long)stuff->configTimestamp);
}
return reply;
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,
" ",
rotation,
stuff->sequenceNumber,
- stuff->timestamp);
+ (unsigned long)stuff->timestamp);
}
return reply;
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)
{
REPLY ("\n");
REPLY ("%67s timestamp(%lums) config_timestamp(%lums) rotation(%s) connection(%s) subpixel_order(%s)",
" ",
- stuff->timestamp,
- stuff->configTimestamp,
+ (unsigned long)stuff->timestamp,
+ (unsigned long)stuff->configTimestamp,
rotation,
connection,
subpixelOrder);
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);
REPLY ("%67s sequence_num(%d) timestamp(%lums) state(%s)",
" ",
stuff->sequenceNumber,
- stuff->timestamp,
+ (unsigned long)stuff->timestamp,
state);
}
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)
{
REPLY (" sequence_num(%d) timestamp(%lums)",
stuff->sequenceNumber,
- stuff->timestamp);
+ (unsigned long)stuff->timestamp);
}
return reply;
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);
REPLY (" sequence_num(%d) timestamp(%lums) state(%s)",
stuff->sequenceNumber,
- stuff->timestamp,
+ (unsigned long)stuff->timestamp,
state);
}
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)
{
REPLY (" sequence_num(%d) timestamp(%lums)",
stuff->sequenceNumber,
- stuff->timestamp);
+ (unsigned long)stuff->timestamp);
}
return reply;
{
xRRGetScreenResourcesReply *stuff = (xRRGetScreenResourcesReply *)rep;
REPLY (": Timestamp(%ldms) ConfigTimestamp(%ldms) nCrtcs(%d) nOutputs(%d) nModes(%d) nbytesNames(%d)",
- stuff->timestamp,
- stuff->configTimestamp,
+ (long int)stuff->timestamp,
+ (long int)stuff->configTimestamp,
stuff->nCrtcs,
stuff->nOutputs,
stuff->nModes,
REPLY ("(");
for (i = 0 ; i < nCrtcs ; i++)
{
- REPLY ("0x%lx", crtcs[i]);
+ REPLY ("0x%x", (unsigned int)crtcs[i]);
if(i != nCrtcs - 1)
REPLY (", ");
}
REPLY ("(");
for (i = 0 ; i < nOutputs ; i++)
{
- REPLY ("0x%lx", outputs[i]);
+ REPLY ("0x%x", (unsigned int)outputs[i]);
if(i != nOutputs - 1)
REPLY (", ");
}
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 (", ");
}
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)",
- stuff->timestamp,
- stuff->crtc,
- stuff->mmWidth,
- stuff->mmHeight,
+ REPLY (": Timestamp(%ldms) Crtc(0x%x) mmSize(%ldx%ld) nCrtcs(%d) nModes(%d) nPreferred(%d) nClones(%d)",
+ (long int)stuff->timestamp,
+ (unsigned int)stuff->crtc,
+ (long int)stuff->mmWidth,
+ (long int)stuff->mmHeight,
stuff->nCrtcs,
stuff->nModes,
stuff->nPreferred,
REPLY ("(");
for (i = 0 ; i < nCrtcs ; i++)
{
- REPLY ("0x%lx", crtcs[i]);
+ REPLY ("0x%x", (unsigned int)crtcs[i]);
if(i != nCrtcs - 1)
REPLY (", ");
}
REPLY ("(");
for (i = 0 ; i < nModes ; i++)
{
- REPLY ("0x%lx", modes[i]);
+ REPLY ("0x%x", (unsigned int)modes[i]);
if(i != nModes - 1)
REPLY (", ");
}
REPLY ("(");
for (i = 0 ; i < nClones ; i++)
{
- REPLY ("0x%lx", clones[i]);
+ REPLY ("0x%x", (unsigned int)clones[i]);
if(i != nClones - 1)
REPLY (", ");
}
reply = xDbgGetAtom(stuff->propertyType, evinfo, reply, len);
REPLY (" bytesAfter(%ld) nItems(%ld)",
- stuff->bytesAfter,
- stuff->nItems);
+ (long int)stuff->bytesAfter,
+ (long int)stuff->nItems);
}
else
{
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)",
- stuff->timestamp,
+ REPLY (" Timestamp(%ldms) coord(%d,%d %dx%d) RRmode(0x%x) rot(%d) rots(%d) nOutput(%d) nPossibleOutput(%d)",
+ (long int)stuff->timestamp,
stuff->x,
stuff->y,
stuff->width,
stuff->height,
- stuff->mode,
+ (unsigned int)stuff->mode,
stuff->rotation,
stuff->rotations,
stuff->nOutput,
REPLY ("(");
for (i = 0 ; i < nOutput ; i++)
{
- REPLY ("0x%lx", outputs[i]);
+ REPLY ("0x%x", (unsigned int)outputs[i]);
if(i != nOutput - 1)
REPLY (", ");
}
REPLY ("(");
for (i = 0 ; i < nPossibleOutput ; i++)
{
- REPLY ("0x%lx", possible[i]);
+ REPLY ("0x%x", (unsigned int)possible[i]);
if(i != nPossibleOutput - 1)
REPLY (", ");
}
xRRSetCrtcConfigReply *stuff = (xRRSetCrtcConfigReply *)rep;
REPLY (" newTimestamp(%ldms)",
- stuff->newTimestamp);
+ (long int)stuff->newTimestamp);
}
else
{
xRRGetScreenResourcesReply *stuff = (xRRGetScreenResourcesReply *)rep;
REPLY (" Timestamp(%ldms) ConfigTimestamp(%ldms) nCrtcs(%d) nOutputs(%d) nModes(%d) nbytesNames(%d)",
- stuff->timestamp,
- stuff->configTimestamp,
+ (long int)stuff->timestamp,
+ (long int)stuff->configTimestamp,
stuff->nCrtcs,
stuff->nOutputs,
stuff->nModes,
REPLY ("(");
for (i = 0 ; i < nCrtcs ; i++)
{
- REPLY ("0x%lx", crtcs[i]);
+ REPLY ("0x%x", (unsigned int)crtcs[i]);
if(i != nCrtcs - 1)
REPLY (", ");
}
REPLY ("(");
for (i = 0 ; i < nOutputs ; i++)
{
- REPLY ("0x%lx", outputs[i]);
+ REPLY ("0x%x", (unsigned int)outputs[i]);
if(i != nOutputs - 1)
REPLY (", ");
}
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 (", ");
}
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,
}
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,
- stuff->offset);
+ (unsigned int)stuff->shmseg,
+ (long int)stuff->offset);
}
return reply;
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,
}
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,
- stuff->offset);
+ (unsigned int)stuff->planeMask,
+ (unsigned int)stuff->shmseg,
+ (long int)stuff->offset);
}
return reply;
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,
- stuff->offset);
+ (unsigned int)stuff->shmseg,
+ (long int)stuff->offset);
}
return reply;
case X_SyncCreateCounter:
{
xSyncCreateCounterReq *stuff = (xSyncCreateCounterReq *)req;
- REPLY (": XID(0x%lx) initValue(%ld/%ld)",
- stuff->cid,
- stuff->initial_value_hi,
- stuff->initial_value_lo);
+ REPLY (": XID(0x%x) initValue(%ld/%ld)",
+ (unsigned int)stuff->cid,
+ (long int)stuff->initial_value_hi,
+ (long int)stuff->initial_value_lo);
return reply;
}
case X_SyncSetCounter:
{
xSyncSetCounterReq *stuff = (xSyncSetCounterReq *)req;
- REPLY (": XID(0x%lx) Value(%ld/%ld)",
- stuff->cid,
- stuff->value_hi,
- stuff->value_lo);
+ REPLY (": XID(0x%x) Value(%ld/%ld)",
+ (unsigned int)stuff->cid,
+ (long int)stuff->value_hi,
+ (long int)stuff->value_lo);
return reply;
}
case X_SyncChangeCounter:
{
xSyncChangeCounterReq *stuff = (xSyncChangeCounterReq *)req;
- REPLY (": XID(0x%lx) Value(%ld/%ld)",
- stuff->cid,
- stuff->value_hi,
- stuff->value_lo);
+ REPLY (": XID(0x%x) Value(%ld/%ld)",
+ (unsigned int)stuff->cid,
+ (long int)stuff->value_hi,
+ (long int)stuff->value_lo);
return reply;
}
case X_SyncQueryCounter:
{
xSyncQueryCounterReq *stuff = (xSyncQueryCounterReq *)req;
- REPLY (": XID(0x%lx)",
- stuff->counter);
+ REPLY (": XID(0x%x)",
+ (unsigned int)stuff->counter);
return reply;
}
case X_SyncDestroyCounter:
{
xSyncDestroyCounterReq *stuff = (xSyncDestroyCounterReq *)req;
- REPLY (": XID(0x%lx)",
- stuff->counter);
+ REPLY (": XID(0x%x)",
+ (unsigned int)stuff->counter);
return reply;
}
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,
case X_TestFakeInput:
{
xTestFakeInputReq *stuff = (xTestFakeInputReq *)req;
- REPLY (": XID(0x%lx)",
- stuff->ack);
+ REPLY (": XID(0x%x)",
+ (unsigned int)stuff->ack);
return reply;
}
case X_TestGetInput:
{
xTestGetInputReq *stuff = (xTestGetInputReq *)req;
- REPLY (": XID(0x%lx)",
- stuff->mode);
+ REPLY (": XID(0x%x)",
+ (unsigned int)stuff->mode);
return reply;
}
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;
}
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);
REPLY (" type(%d) detail(%d) time(%lums) device_id(%d)",
stuff->type,
stuff->detail,
- stuff->time,
+ (unsigned long)stuff->time,
stuff->deviceid);
}
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);
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)
{
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)
{
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);
case X_ShapeQueryExtents:
{
xShapeQueryExtentsReq *stuff = (xShapeQueryExtentsReq *)req;
- REPLY (": XID(0x%lx)",
- stuff->window);
+ REPLY (": XID(0x%x)",
+ (unsigned int)stuff->window);
return reply;
}
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)
{
case X_ShapeInputSelected:
{
xShapeInputSelectedReq *stuff = (xShapeInputSelectedReq *)req;
- REPLY (": XID(0x%lx)",
- stuff->window);
+ REPLY (": XID(0x%x)",
+ (unsigned int)stuff->window);
return reply;
}
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)
{
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,
- stuff->offset);
+ (unsigned int)stuff->shmseg,
+ (long int)stuff->offset);
}
return reply;
}
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)
{
REPLY ("%67s sequence_num(%d) time(%lums) count(%d) destroyed(%s)",
" ",
stuff->sequenceNumber,
- stuff->time,
+ (unsigned long)stuff->time,
stuff->count,
stuff->destroyed ? "YES" : "NO");
}
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)
{
REPLY ("%67s sequence_num(%d) time(%lums) state(%d)",
" ",
stuff->sequenceNumber,
- stuff->time,
+ (unsigned long)stuff->time,
stuff->state);
}
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,
" ",
kind,
stuff->sequenceNumber,
- stuff->time,
+ (unsigned long)stuff->time,
stuff->shaped ? "EXIST" : "NON_EXIST");
}
if (evinfo->rep.isStart)
{
xShmGetImageReply *stuff = (xShmGetImageReply *)rep;
- REPLY (": Visual(0x%lx) size(%ld) sequence_num(%d)",
- stuff->visual,
- stuff->size,
+ REPLY (": Visual(0x%x) size(%ld) sequence_num(%d)",
+ (unsigned int)stuff->visual,
+ (long int)stuff->size,
stuff->sequenceNumber);
}
else
{
xSyncQueryCounterReply *stuff = (xSyncQueryCounterReply *)rep;
REPLY (": Value(%ld/%ld) sequence_num(%d)",
- stuff->value_hi,
- stuff->value_lo,
+ (long int)stuff->value_hi,
+ (long int)stuff->value_lo,
stuff->sequenceNumber);
}
else
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
}
REPLY (": ordering(%s) nrects(%ld)",
ordering,
- stuff->nrects);
+ (long int)stuff->nrects);
}
else
{
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)
REPLY (")");
REPLY (" time(%lums) evt_cnt(%d) owner_events(%s)",
- stuff->time,
+ (unsigned long)stuff->time,
stuff->event_count,
stuff->ownerEvents ? "YES" : "NO");
}
if (detail_level >= EVLOG_PRINT_DETAIL)
{
REPLY (" time(%lums)",
- stuff->time);
+ (unsigned long)stuff->time);
}
return reply;
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)
{
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)
{
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)
{
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)
{
if (detail_level >= EVLOG_PRINT_DETAIL)
{
REPLY (" time(%lums) mode(%d)",
- stuff->time,
+ (unsigned long)stuff->time,
stuff->mode);
}
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)
{
REPLY (" time(%lums) revertTo(%d)",
- stuff->time,
+ (unsigned long)stuff->time,
stuff->revertTo);
}
{
REPLY (" valuator%d(%ld)",
i,
- *(&stuff->valuator0 + i));
+ (long int)*(&stuff->valuator0 + i));
}
}
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)
{
REPLY ("\n");
REPLY ("%67s time(%lums) state(%d) key_code(%d) same_screen(%s) device_state(%d) first_axis(%d)",
" ",
- stuff->time,
+ (unsigned long)stuff->time,
stuff->state,
stuff->keycode,
stuff->same_screen ? "YES" : "NO",
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)
{
REPLY ("\n");
REPLY ("%67s time(%lums) state(%d) key_code(%d) same_screen(%s) device_state(%d) first_axis(%d)",
" ",
- stuff->time,
+ (unsigned long)stuff->time,
stuff->state,
stuff->keycode,
stuff->same_screen ? "YES" : "NO",
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)
{
REPLY ("\n");
REPLY ("%67s time(%lums) state(%d) button(%d) same_screen(%s) device_state(%d) first_axis(%d)",
" ",
- stuff->time,
+ (unsigned long)stuff->time,
stuff->state,
stuff->button,
stuff->same_screen ? "YES" : "NO",
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)
{
REPLY ("\n");
REPLY ("%67s time(%lums) state(%d) button(%d) same_screen(%s) device_state(%d) first_axis(%d)",
" ",
- stuff->time,
+ (unsigned long)stuff->time,
stuff->state,
stuff->button,
stuff->same_screen ? "YES" : "NO",
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)
{
REPLY ("\n");
REPLY ("%67s time(%lums) state(%d) is_hint(%d) same_screen(%s) device_state(%d) first_axis(%d)",
" ",
- stuff->time,
+ (unsigned long)stuff->time,
stuff->state,
stuff->is_hint,
stuff->same_screen ? "YES" : "NO",
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)
{
REPLY (" mode(%s) detail(%s) time(%lums)",
mode,
detail,
- stuff->time);
+ (unsigned long)stuff->time);
}
return reply;
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)
{
REPLY (" mode(%s) detail(%s) time(%lums)",
mode,
detail,
- stuff->time);
+ (unsigned long)stuff->time);
}
return reply;
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)
{
REPLY ("\n");
REPLY ("%67s time(%lums) state(%d) same_screen(%s) device_state(%d) first_axis(%d)",
" ",
- stuff->time,
+ (unsigned long)stuff->time,
stuff->state,
stuff->same_screen ? "YES" : "NO",
stuff->device_state,
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)
{
REPLY ("\n");
REPLY ("%67s time(%lums) state(%d) same_screen(%s) device_state(%d) first_axis(%d)",
" ",
- stuff->time,
+ (unsigned long)stuff->time,
stuff->state,
stuff->same_screen ? "YES" : "NO",
stuff->device_state,
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)
{
REPLY (" time(%lums) num_classes(%d)",
- stuff->time,
+ (unsigned long)stuff->time,
stuff->num_classes);
}
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)
{
}
REPLY (" time(%lums) request(%s) first_keycode(%d) count(%d)",
- stuff->time,
+ (unsigned long)stuff->time,
request,
stuff->first_keycode,
stuff->count);
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)
{
}
REPLY (" time(%lums) request(%s)",
- stuff->time,
+ (unsigned long)stuff->time,
request);
}
if (detail_level >= EVLOG_PRINT_DETAIL)
{
REPLY (" time(%lums) device_change(%d) control(%d) sequence_num(%d)",
- stuff->time,
+ (unsigned long)stuff->time,
stuff->devchange,
stuff->control,
stuff->sequenceNumber);
if (detail_level >= EVLOG_PRINT_DETAIL)
{
REPLY (" time(%lums) state(%d) sequence_num(%d)",
- stuff->time,
+ (unsigned long)stuff->time,
stuff->state,
stuff->sequenceNumber);
}
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
{
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)
{
REPLY (" time(%lums)",
- stuff->time);
+ (unsigned long)stuff->time);
}
return reply;
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)
{
REPLY (" time(%lums)",
- stuff->time);
+ (unsigned long)stuff->time);
}
return reply;
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,
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,
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,
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,
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;
}
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)
{
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)
{
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,
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);
if (detail_level >= EVLOG_PRINT_DETAIL)
{
REPLY (" value(%ld)",
- stuff->value);
+ (long int)stuff->value);
}
return reply;
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);
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,
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,
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,
- stuff->offset,
+ (unsigned int)stuff->shmseg,
+ (long int)stuff->offset,
stuff->send_event ? "YES" : "NO");
}
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)
{
REPLY (" serial(%lu) reason(%lu) time(%lums)",
- stuff->serial,
- stuff->reason,
- stuff->time);
+ (unsigned long)stuff->serial,
+ (unsigned long)stuff->reason,
+ (unsigned long)stuff->time);
}
return reply;
case XvPortNotify:
{
XvPortNotifyEvent *stuff = (XvPortNotifyEvent *) evt;
- REPLY (": XID(0x%lx) Value(%ld)",
- stuff->port_id,
- stuff->value);
+ REPLY (": XID(0x%x) Value(%ld)",
+ (unsigned int)stuff->port_id,
+ (long int)stuff->value);
REPLY (" Attribute");
reply = xDbgGetAtom(stuff->attribute, evinfo, reply, len);
if (detail_level >= EVLOG_PRINT_DETAIL)
{
REPLY (" serial(%lu) value(%ld) time(%lums)",
- stuff->serial,
- stuff->value,
- stuff->time);
+ (unsigned long)stuff->serial,
+ (long int)stuff->value,
+ (unsigned long)stuff->time);
}
return reply;
#ifndef __XDBG_TYPES_H__
#define __XDBG_TYPES_H__
+#include <config.h>
+
#include <xf86.h>
#include <X11/Xdefs.h> /* for Bool */
#include <X11/Xlib.h>
# Checks for pkg-config packages
PKG_CHECK_MODULES(XDBG, dlog xorg-server x11 xdamage xext dbus-1 bigreqsproto compositeproto damageproto dri2proto fixesproto fontsproto gestureproto inputproto kbproto randrproto recordproto renderproto resourceproto videoproto xcmiscproto xextproto xf86vidmodeproto xproto libdrm xcomposite libdri2 xgesture xtst xrandr xi xv)
+PKG_CHECK_MODULES(HWC, libhwc hwcproto,
+ [SAVE_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $HWC_CFLAGS"
+ AC_CHECK_HEADERS([X11/extensions/hwc.h],[have_hwc_h="yes"],[have_hwc_h="no"])
+ CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
+
+AM_CONDITIONAL(HAVE_HWC, [test "x$have_hwc_h" = xyes])
+if test "x$have_hwc_h" = xyes; then
+ AC_DEFINE(HAVE_HWC, 1, [Have libhwc])
+ XDBG_CFLAGS="$XDBG_CFLAGS $HWC_CFLAGS"
+ XDBG_LIBS="$XDBG_LIBS $HWC_LIBS"
+fi
+
AC_SUBST([XDBG_CFLAGS])
AC_SUBST([XDBG_LIBS])
#include "config.h"
#endif
+#include <sys/time.h>
+#include <unistd.h>
+#include <time.h>
#include <string.h>
#include <stdarg.h>
#include <dlog.h>
#define MAX_MODULE_NAME 4
#define MAX_MODULE_CNT 256
#define BUF_LEN 1024
+#define MAX_MONTH 12
typedef struct
{
static ModuleInfo modules[MAX_MODULE_CNT];
static int module_cnt = 0;
static int default_level = XLOG_LEVEL_DEFAULT;
+static char *st_month[MAX_MONTH] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
static Bool dlog_enable;
char tmpBuf[BUF_LEN];
int loglevel = logoption & XLOG_MASK_LOGLEVEL;
const char *name;
+ struct timeval tv;
+ struct tm *tm=NULL;
if (!h)
return;
snprintf(tmpBuf, BUF_LEN, "[%s]%s", (name)?name:"", f);
kLogWrapper (loglevel, logoption, file, line, tmpBuf, args);
}
-
- /* write to file */
- if (loglevel >= XLOG_LEVEL_INFO)
+ else if (loglevel >= XLOG_LEVEL_INFO)
{
- if (logoption & XLOG_OPTION_SECURE)
- snprintf(tmpBuf, BUF_LEN, "(%s) > [SECURE_LOG] [%s]%s", ostr[loglevel], (name)?name:"", f);
- else
- snprintf(tmpBuf, BUF_LEN, "(%s) [%s]%s", ostr[loglevel], (name)?name:"", f);
+ if( !dlog_enable )
+ {
+ /* get local time from tv */
+ gettimeofday(&tv, NULL);
+ tm = localtime(&tv.tv_sec);
+
+ /* write to file */
+ if (logoption & XLOG_OPTION_SECURE)
+ snprintf(tmpBuf, BUF_LEN, "[%s %d %02d:%02d:%02d:%03ld] (%s) > [SECURE_LOG] [%s]%s", st_month[tm->tm_mon], tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec, tv.tv_usec/1000, ostr[loglevel], (name)?name:"", f);
+ else
+ snprintf(tmpBuf, BUF_LEN, "[%s %d %02d:%02d:%02d:%03ld] (%s) [%s]%s", st_month[tm->tm_mon], tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec, tv.tv_usec/1000, ostr[loglevel], (name)?name:"", f);
- if (!dlog_enable)
LogVWrite (1, tmpBuf, args);
+ }
else
{
- dLogWrapper (loglevel, logoption, file, line, tmpBuf, args);
+ /* dlog already supports localtime stamp. So we just add clock time! */
+ /* write to file */
+ if (logoption & XLOG_OPTION_SECURE)
+ snprintf(tmpBuf, BUF_LEN, "[%10.3f] (%s) > [SECURE_LOG] [%s]%s", GetTimeInMillis()/1000.0, ostr[loglevel], (name)?name:"", f);
+ else
+ snprintf(tmpBuf, BUF_LEN, "[%10.3f] (%s) [%s]%s", GetTimeInMillis()/1000.0, ostr[loglevel], (name)?name:"", f);
- /* write to Xorg.0.log too */
- if (loglevel >= XLOG_LEVEL_WARNING)
- LogVWrite (1, tmpBuf, args);
+ dLogWrapper (loglevel, logoption, file, line, tmpBuf, args);
}
}
char *buf = tmpBuf;
int remain = BUF_LEN;
int len = 0;
+ unsigned int tv_ms;
+
+ if( tm == NULL )
+ {
+ gettimeofday(&tv, NULL);
+ tm = localtime(&tv.tv_sec);
+ }
- len = snprintf (buf, remain, "(%s) [%10.3f][%s]", ostr[loglevel], GetTimeInMillis()/1000.0, name?name:"");
+ tv_ms = tv.tv_usec/1000;
+ len = snprintf (buf, remain, "[%10.3f] [%s %d %02d:%02d:%02d:%03d] (%s) [%s]", GetTimeInMillis()/1000.0, st_month[tm->tm_mon], tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec, tv_ms, ostr[loglevel], name?name:"");
buf += len;
remain -= len;
XLOG_LEVEL_3,
XLOG_LEVEL_4,
XLOG_LEVEL_MAX,
- XLOG_LEVEL_DEFAULT = XLOG_LEVEL_2,
+ XLOG_LEVEL_DEFAULT = XLOG_LEVEL_MAX,
};
#define XDBG_ALL_MODULE 0xFFFFFFFF
XDBG_TRACE (MMEM,"Unset WinPixmap win(0x%x): pixmap(%p) to NULL\n",
(unsigned int)pWin->drawable.id, d->pRefPixmap->pPixmap);
- xorg_list_del (&d->pRefPixmap->link);
- free (d->pRefPixmap);
+ p_ref = _findXDbgRefPixmap (d, d->pRefPixmap->pPixmap);
+ if(p_ref)
+ {
+ xorg_list_del (&d->pRefPixmap->link);
+ free (d->pRefPixmap);
+ }
+ else
+ XDBG_WARNING (MMEM, "Unknown refpixmap : WinPixmap win(0x%x) pixmap(%p) \n",
+ (unsigned int)pWin->drawable.id, d->pRefPixmap->pPixmap);
+
d->pRefPixmap = NULL;
if (xorg_list_is_empty (&d->refPixmaps))
int xev_trace_detail_level = EVLOG_PRINT_DEFAULT;
static int xev_trace_fd = -1;
static int xev_trace_record_fd = -1;
-static Atom atom_rotate = None;
static Atom atom_client_pid = None;
static int init = 0;
{
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;
if (atom_client_pid == None)
atom_client_pid = MakeAtom ("X_CLIENT_PID", 12, TRUE);
- if (atom_rotate == None)
- atom_rotate = MakeAtom ("_E_ILLUME_ROTATE_ROOT_ANGLE", 12, TRUE);
if (!ret)
{
xDbgModuleParseOptions (XDbgModule *pMod, XF86OptionPtr pOpt)
{
OptionInfoPtr options = xnfalloc (sizeof (module_options));
- char *log_path, *evlog_path, *evlog_rule_path;
+ const char *path;
+ char temp[256];
int log_level = XLOG_LEVEL_DEFAULT;
memcpy (options, module_options, sizeof(module_options));
xDbgLogEnableDlog (pMod->dlog);
/* log_path */
- log_path = xf86GetOptValString (options, OPTION_LOG_PATH);
- XDBG_INFO (MXDBG, "log path: \"%s\"\n", (log_path)?log_path:"none");
+ path = xf86GetOptValString (options, OPTION_LOG_PATH);
+ XDBG_INFO (MXDBG, "log path: \"%s\"\n", (path)?path:"none");
+ if (path)
+ {
+ snprintf (temp, sizeof(temp), "%s", path);
+ xDbgModuleCommandInitLogPath (pMod, temp);
+ }
/* log_level */
xf86GetOptValInteger (options, OPTION_LOG_LEVEL, &log_level);
xDbgLogSetLevel (XDBG_ALL_MODULE, log_level);
/* evlog_path */
- evlog_path = xf86GetOptValString (options, OPTION_EVLOG_PATH);
- XDBG_INFO (MXDBG, "evlog path: \"%s\"\n", (evlog_path)?evlog_path:"none");
+ path = xf86GetOptValString (options, OPTION_EVLOG_PATH);
+ XDBG_INFO (MXDBG, "evlog path: \"%s\"\n", (path)?path:"none");
+ if (path)
+ {
+ snprintf (temp, sizeof(temp), "%s", path);
+ xDbgModuleEvlogSetEvlogPath (pMod, -1, temp, NULL, NULL);
+ }
/* evlog_rule_path */
- evlog_rule_path = xf86GetOptValString (options, OPTION_EVLOG_RULE_PATH);
- XDBG_INFO (MXDBG, "evlog rule path: \"%s\"\n", (evlog_rule_path)?evlog_rule_path:"none");
-
- xDbgModuleCommandInitLogPath (pMod, log_path);
- xDbgModuleEvlogSetEvlogPath (pMod, -1, evlog_path, NULL, NULL);
- xDbgModuleCommandInitEvlogRulePath (pMod, evlog_rule_path);
+ path = xf86GetOptValString (options, OPTION_EVLOG_RULE_PATH);
+ XDBG_INFO (MXDBG, "evlog rule path: \"%s\"\n", (path)?path:"none");
+ if (path)
+ {
+ snprintf (temp, sizeof(temp), "%s", path);
+ xDbgModuleCommandInitEvlogRulePath (pMod, temp);
+ }
free (options);
}
Name: xorg-x11-module-xdbg
Summary: Xserver debug module
-Version: 0.1.33
+Version: 0.1.46
Release: 1
VCS: adaptation/xorg/driver/xserver-xorg-module-xdbg#xorg-x11-module-xdbg-0.1.13-1-79-gfb1d23b62faa7f302ac1b19ff1d3f757c4745b13
Group: System/Libraries
%remove_docs
%files
+%manifest xorg-x11-module-xdbg.manifest
%defattr(-,root,root,-)
/usr/share/license/%{name}
%{_bindir}/xdbg
--- /dev/null
+<manifest>
+ <request>
+ <domain name="_"/>
+ </request>
+ <assign>
+ <filesystem path="/usr/bin/*" label="_" exec_label="none" />
+ </assign>
+</manifest>
+
projects / adaptation / xorg / driver / xserver-xorg-module-xdbg.git / commitdiff