Include client name if available in PrintDeviceGrabInfo
Also adds missing newline to first line of output. Before patch: [3581472.414] (II) Printing all currently active device grabs: [3581472.414] Active grab 0x1800000 (core) on device 'Virtual core pointer' (2): client pid 26174 uid 0 gid 10 [3581472.415] at 3581469139 (from active grab) (device thawed, state 1) [3581472.415] core event mask 0x0 [3581472.415] owner-events true, kb 1 ptr 1, confine 0, cursor 0x0 [3581472.415] Active grab 0x1800000 (core) on device 'Virtual core keyboard' (3) : client pid 26174 uid 0 gid 10 [3581472.415] at 3581469139 (from active grab) (device thawed, state 1) [3581472.415] core event mask 0x3 [3581472.415] owner-events true, kb 1 ptr 1, confine 0, cursor 0x0 [3581472.415] (II) End list of active device grabs After patch: [3581736.601] (II) Printing all currently active device grabs: [3581736.601] Active grab 0x1600000 (core) on device 'Virtual core pointer' (2): [3581736.601] client pid 26741 /usr/bin/xscreensaver -nosplash [3581736.601] at 3581735000 (from active grab) (device thawed, state 1) [3581736.601] core event mask 0x0 [3581736.601] owner-events true, kb 1 ptr 1, confine 0, cursor 0x0 [3581736.601] Active grab 0x1600000 (core) on device 'Virtual core keyboard' (3) : [3581736.601] client pid 26741 /usr/bin/xscreensaver -nosplash [3581736.601] at 3581735000 (from active grab) (device thawed, state 1) [3581736.601] core event mask 0x3 [3581736.601] owner-events true, kb 1 ptr 1, confine 0, cursor 0x0 [3581736.601] (II) End list of active device grabs Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Rami Ylimäki <rami.ylimaki@vincit.fi>
This commit is contained in:
parent
372a6f10dc
commit
dd80156bf0
35
dix/grabs.c
35
dix/grabs.c
|
@ -61,6 +61,7 @@ SOFTWARE.
|
||||||
#include "xace.h"
|
#include "xace.h"
|
||||||
#include "exevents.h"
|
#include "exevents.h"
|
||||||
#include "inpututils.h"
|
#include "inpututils.h"
|
||||||
|
#include "client.h"
|
||||||
|
|
||||||
#define BITMASK(i) (((Mask)1) << ((i) & 31))
|
#define BITMASK(i) (((Mask)1) << ((i) & 31))
|
||||||
#define MASKIDX(i) ((i) >> 5)
|
#define MASKIDX(i) ((i) >> 5)
|
||||||
|
@ -77,25 +78,41 @@ PrintDeviceGrabInfo(DeviceIntPtr dev)
|
||||||
int i, j;
|
int i, j;
|
||||||
GrabInfoPtr devGrab = &dev->deviceGrab;
|
GrabInfoPtr devGrab = &dev->deviceGrab;
|
||||||
GrabPtr grab = devGrab->grab;
|
GrabPtr grab = devGrab->grab;
|
||||||
|
Bool clientIdPrinted = FALSE;
|
||||||
|
|
||||||
ErrorF("Active grab 0x%lx (%s) on device '%s' (%d):",
|
ErrorF("Active grab 0x%lx (%s) on device '%s' (%d):\n",
|
||||||
(unsigned long) grab->resource,
|
(unsigned long) grab->resource,
|
||||||
(grab->grabtype == GRABTYPE_XI2) ? "xi2" :
|
(grab->grabtype == GRABTYPE_XI2) ? "xi2" :
|
||||||
((grab->grabtype == GRABTYPE_CORE) ? "core" : "xi1"),
|
((grab->grabtype == GRABTYPE_CORE) ? "core" : "xi1"),
|
||||||
dev->name, dev->id);
|
dev->name, dev->id);
|
||||||
|
|
||||||
client = clients[CLIENT_ID(grab->resource)];
|
client = clients[CLIENT_ID(grab->resource)];
|
||||||
if (client && GetLocalClientCreds(client, &lcc) != -1)
|
if (client)
|
||||||
{
|
{
|
||||||
ErrorF(" client pid %ld uid %ld gid %ld\n",
|
pid_t clientpid = GetClientPid(client);
|
||||||
(lcc->fieldsSet & LCC_PID_SET) ? (long) lcc->pid : 0,
|
const char *cmdname = GetClientCmdName(client);
|
||||||
(lcc->fieldsSet & LCC_UID_SET) ? (long) lcc->euid : 0,
|
const char *cmdargs = GetClientCmdArgs(client);
|
||||||
(lcc->fieldsSet & LCC_GID_SET) ? (long) lcc->egid : 0);
|
|
||||||
FreeLocalClientCreds(lcc);
|
if ((clientpid > 0) && (cmdname != NULL))
|
||||||
|
{
|
||||||
|
ErrorF(" client pid %ld %s %s\n",
|
||||||
|
(long) clientpid, cmdname, cmdargs ? cmdargs : "");
|
||||||
|
clientIdPrinted = TRUE;
|
||||||
|
}
|
||||||
|
else if (GetLocalClientCreds(client, &lcc) != -1)
|
||||||
|
{
|
||||||
|
ErrorF(" client pid %ld uid %ld gid %ld\n",
|
||||||
|
(lcc->fieldsSet & LCC_PID_SET) ? (long) lcc->pid : 0,
|
||||||
|
(lcc->fieldsSet & LCC_UID_SET) ? (long) lcc->euid : 0,
|
||||||
|
(lcc->fieldsSet & LCC_GID_SET) ? (long) lcc->egid : 0);
|
||||||
|
FreeLocalClientCreds(lcc);
|
||||||
|
clientIdPrinted = TRUE;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
if (!clientIdPrinted)
|
||||||
{
|
{
|
||||||
ErrorF(" (no client information available)\n");
|
ErrorF(" (no client information available for client %d)\n",
|
||||||
|
CLIENT_ID(grab->resource));
|
||||||
}
|
}
|
||||||
|
|
||||||
/* XXX is this even correct? */
|
/* XXX is this even correct? */
|
||||||
|
|
Loading…
Reference in New Issue
Block a user