xserver: Branch 'mpx' - 4 commits
Peter Hutterer
whot at kemper.freedesktop.org
Wed Dec 12 22:39:52 PST 2007
dix/events.c | 2 +-
mi/mieq.c | 17 +++++++++--------
mi/miinitext.c | 6 +++---
mi/miregion.c | 8 ++++----
4 files changed, 17 insertions(+), 16 deletions(-)
New commits:
commit d86e7f2ecc0a0129a722ffaca93dfc7c0c60e842
Author: Peter Hutterer <peter at cs.unisa.edu.au>
Date: Fri Dec 7 20:40:21 2007 +1030
dix: when getting a bogus event, at least print out the type.
diff --git a/dix/events.c b/dix/events.c
index 340e2bc..bb42259 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -4008,7 +4008,7 @@ ProcessPointerEvent (xEvent *xE, DeviceIntPtr mouse, int count)
deactivateGrab = TRUE;
break;
default:
- FatalError("bogus pointer event from ddx");
+ FatalError("bogus pointer event from ddx. Type %d\n", xE->u.u.type);
}
}
commit 3a058456e0ce531b21ae2b37be8868b8e0d56e56
Author: Peter Hutterer <peter at cs.unisa.edu.au>
Date: Fri Dec 7 20:23:36 2007 +1030
mi: unify ErrorFs, prepend [mi]
diff --git a/mi/miinitext.c b/mi/miinitext.c
index 6eb0352..45a14af 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -518,11 +518,11 @@ void EnableDisableExtensionError(char *name, Bool enable)
{
ExtensionToggle *ext = &ExtensionToggleList[0];
- ErrorF("Extension \"%s\" is not recognized\n", name);
- ErrorF("Only the following extensions can be run-time %s:\n",
+ ErrorF("[mi] Extension \"%s\" is not recognized\n", name);
+ ErrorF("[mi] Only the following extensions can be run-time %s:\n",
enable ? "enabled" : "disabled");
for (ext = &ExtensionToggleList[0]; ext->name != NULL; ext++)
- ErrorF(" %s\n", ext->name);
+ ErrorF("[mi] %s\n", ext->name);
}
#ifndef XFree86LOADER
diff --git a/mi/miregion.c b/mi/miregion.c
index 45768a3..6316561 100644
--- a/mi/miregion.c
+++ b/mi/miregion.c
@@ -267,13 +267,13 @@ miPrintRegion(rgn)
num = REGION_NUM_RECTS(rgn);
size = REGION_SIZE(rgn);
rects = REGION_RECTS(rgn);
- ErrorF("num: %d size: %d\n", num, size);
- ErrorF("extents: %d %d %d %d\n",
+ ErrorF("[mi] num: %d size: %d\n", num, size);
+ ErrorF("[mi] extents: %d %d %d %d\n",
rgn->extents.x1, rgn->extents.y1, rgn->extents.x2, rgn->extents.y2);
for (i = 0; i < num; i++)
- ErrorF("%d %d %d %d \n",
+ ErrorF("[mi] %d %d %d %d \n",
rects[i].x1, rects[i].y1, rects[i].x2, rects[i].y2);
- ErrorF("\n");
+ ErrorF("[mi] \n");
}
_X_EXPORT Bool
commit c5acf401dad6fbca47f2bb870185c1d08ac947a5
Author: Peter Hutterer <peter at cs.unisa.edu.au>
Date: Fri Dec 7 20:19:43 2007 +1030
mi: unify last two ErrorF's in mieq.c
diff --git a/mi/mieq.c b/mi/mieq.c
index 1515512..31f838c 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -187,7 +187,7 @@ mieqEnqueue(DeviceIntPtr pDev, xEvent *e)
evt->event = xrealloc(evt->event, evt->evlen);
if (!evt->event)
{
- ErrorF("Running out of memory. Tossing event.\n");
+ ErrorF("[mi] Running out of memory. Tossing event.\n");
return;
}
}
@@ -221,7 +221,7 @@ void
mieqSetHandler(int event, mieqHandler handler)
{
if (handler && miEventQueue.handlers[event])
- ErrorF("mieq: warning: overriding existing handler %p with %p for "
+ ErrorF("[mi] mieq: warning: overriding existing handler %p with %p for "
"event %d\n", miEventQueue.handlers[event], handler, event);
miEventQueue.handlers[event] = handler;
commit 117458d2db49efd3f04432ff45871b44c7d4ad57
Author: Peter Hutterer <peter at cs.unisa.edu.au>
Date: Fri Dec 7 20:18:49 2007 +1030
mi: change infamous "Tossed event ..." error for something more explanatory.
Few whitespace errors fixed.
Two ErrorF's prefixed with [mi].
diff --git a/mi/mieq.c b/mi/mieq.c
index 5dcc404..1515512 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -142,7 +142,7 @@ mieqEnqueue(DeviceIntPtr pDev, xEvent *e)
lastkbp = (deviceKeyButtonPointer *) laste->events->event;
if (laste->nevents > 6) {
- ErrorF("mieqEnqueue: more than six valuator events; dropping.\n");
+ ErrorF("[mi] mieqEnqueue: more than six valuator events; dropping.\n");
return;
}
if (oldtail == miEventQueue.head ||
@@ -151,7 +151,7 @@ mieqEnqueue(DeviceIntPtr pDev, xEvent *e)
lastkbp->type == DeviceButtonRelease) ||
((lastkbp->deviceid & DEVICE_BITS) !=
(v->deviceid & DEVICE_BITS))) {
- ErrorF("mieqEnequeue: out-of-order valuator event; dropping.\n");
+ ErrorF("[mi] mieqEnequeue: out-of-order valuator event; dropping.\n");
return;
}
@@ -164,12 +164,13 @@ mieqEnqueue(DeviceIntPtr pDev, xEvent *e)
oldtail = (oldtail - 1) % QUEUE_SIZE;
}
else {
- newtail = (oldtail + 1) % QUEUE_SIZE;
- /* Toss events which come in late. Usually this means your server's
+ newtail = (oldtail + 1) % QUEUE_SIZE;
+ /* Toss events which come in late. Usually this means your server's
* stuck in an infinite loop somewhere, but SIGIO is still getting
* handled. */
- if (newtail == miEventQueue.head) {
- ErrorF("tossed event which came in late\n");
+ if (newtail == miEventQueue.head) {
+ ErrorF("[mi] EQ overflowing. The server is probably stuck "
+ "in an infinite loop.\n");
return;
}
miEventQueue.tail = newtail;
More information about the xorg-commit
mailing list