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

sanitise debug output 

Don't spit out huge chunks of pointless ephemera, especially without
--enable-debug.
This commit is contained in:
Daniel Stone 2006-07-20 16:49:17 -04:00 committed by Daniel Stone
parent 463e0fe35b
commit f18c3122a5
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/kdrive/src/kinput.c
View File

@ -408,7 +408,9 @@ KdPointerProc(DeviceIntPtr pDevice, int onoff)
switch (onoff) switch (onoff)
{ {
case DEVICE_INIT: case DEVICE_INIT:
#ifdef DEBUG
ErrorF("initialising pointer %s ...\n", pi->name); ErrorF("initialising pointer %s ...\n", pi->name);
#endif
if (!pi->driver) { if (!pi->driver) {
if (!pi->driverPrivate) { if (!pi->driverPrivate) {
ErrorF("no driver specified for %s\n", pi->name); ErrorF("no driver specified for %s\n", pi->name);
@ -468,7 +470,6 @@ KdPointerProc(DeviceIntPtr pDevice, int onoff)
} }
if ((*pi->driver->Enable) (pi) == Success) { if ((*pi->driver->Enable) (pi) == Success) {
ErrorF("initialised fine, returning success\n");
pDev->on = TRUE; pDev->on = TRUE;
return Success; return Success;
} }
@ -495,13 +496,11 @@ KdPointerProc(DeviceIntPtr pDevice, int onoff)
return Success; return Success;
case DEVICE_CLOSE: case DEVICE_CLOSE:
ErrorF("D_C\n");
if (pDev->on) { if (pDev->on) {
if (!pi->driver->Disable) { if (!pi->driver->Disable) {
return BadImplementation; return BadImplementation;
} }
(*pi->driver->Disable) (pi); (*pi->driver->Disable) (pi);
ErrorF("disabled\n");
pDev->on = FALSE; pDev->on = FALSE;
} }
@ -509,10 +508,8 @@ KdPointerProc(DeviceIntPtr pDevice, int onoff)
return BadImplementation; return BadImplementation;
(*pi->driver->Fini) (pi); (*pi->driver->Fini) (pi);
ErrorF("finished\n");
KdRemovePointer(pi); KdRemovePointer(pi);
ErrorF("removed\n");
return Success; return Success;
} }

10
mi/mieq.c
View File

@ -101,7 +101,10 @@ mieqEnqueue (xEvent *e)
deviceKeyButtonPointer *lastkbp = (deviceKeyButtonPointer *) deviceKeyButtonPointer *lastkbp = (deviceKeyButtonPointer *)
&laste->event[0]; &laste->event[0];
#ifdef DEBUG
ErrorF("mieqEnqueue: slamming an event on to the queue from %d\n", kbp->deviceid & DEVICE_BITS); ErrorF("mieqEnqueue: slamming an event on to the queue from %d\n", kbp->deviceid & DEVICE_BITS);
#endif
if (e->u.u.type == MotionNotify) { if (e->u.u.type == MotionNotify) {
miPointerAbsoluteCursor(e->u.keyButtonPointer.rootX, miPointerAbsoluteCursor(e->u.keyButtonPointer.rootX,
e->u.keyButtonPointer.rootY, e->u.keyButtonPointer.rootY,
@ -135,7 +138,6 @@ mieqEnqueue (xEvent *e)
return; return;
} }
laste->event[laste->nevents++] = *e; laste->event[laste->nevents++] = *e;
ErrorF("put a valuator event into the queue\n");
return; return;
} }
else if (e->u.u.type == DeviceMotionNotify) { else if (e->u.u.type == DeviceMotionNotify) {
@ -174,9 +176,11 @@ mieqEnqueue (xEvent *e)
if (e->u.keyButtonPointer.time < miEventQueue.lastEventTime && if (e->u.keyButtonPointer.time < miEventQueue.lastEventTime &&
miEventQueue.lastEventTime - e->u.keyButtonPointer.time < 10000) miEventQueue.lastEventTime - e->u.keyButtonPointer.time < 10000)
{ {
#ifdef DEBUG
ErrorF("mieq: rewinding event time from %d to %d\n", ErrorF("mieq: rewinding event time from %d to %d\n",
miEventQueue.lastEventTime, miEventQueue.lastEventTime,
miEventQueue.events[oldtail].event[0].u.keyButtonPointer.time); miEventQueue.events[oldtail].event[0].u.keyButtonPointer.time);
#endif
miEventQueue.events[oldtail].event[0].u.keyButtonPointer.time = miEventQueue.events[oldtail].event[0].u.keyButtonPointer.time =
miEventQueue.lastEventTime; miEventQueue.lastEventTime;
} }
@ -186,7 +190,6 @@ mieqEnqueue (xEvent *e)
miEventQueue.events[oldtail].pDev = pDev; miEventQueue.events[oldtail].pDev = pDev;
miEventQueue.lastMotion = isMotion; miEventQueue.lastMotion = isMotion;
ErrorF("bottom of mieqEnqueue\n");
} }
void void
@ -206,8 +209,6 @@ void mieqProcessInputEvents ()
EventRec *e; EventRec *e;
int x, y; int x, y;
ErrorF("mieqPIE: head %p, tail %p\n", miEventQueue.head, miEventQueue.tail);
while (miEventQueue.head != miEventQueue.tail) while (miEventQueue.head != miEventQueue.tail)
{ {
if (screenIsSaved == SCREEN_SAVER_ON) if (screenIsSaved == SCREEN_SAVER_ON)
@ -234,7 +235,6 @@ void mieqProcessInputEvents ()
miEventQueue.head = 0; miEventQueue.head = 0;
else else
++miEventQueue.head; ++miEventQueue.head;
ErrorF("calling pIP from mieqPIE\n");
(*e->pDev->public.processInputProc)(e->event, e->pDev, e->nevents); (*e->pDev->public.processInputProc)(e->event, e->pDev, e->nevents);
} }
} }