Debugging: Print each touch's state bitmask in mtstate_output

The user is expected to decode the hex (with reference to the bit
numbers defined in mtstate.h).

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/src/mtstate.c b/src/mtstate.c
index 348d21479d36624d3cf036ae80087ad0d6986d39..bd9a7e38d91e26899184a84d426f8095f07f6b77 100644 (file)
--- a/src/mtstate.c
+++ b/src/mtstate.c
@@ -286,25 +286,25 @@ static void mtstate_output(const struct MTState* ms,
        foreach_bit(i, ms->touch_used) {
                if (GETBIT(ms->touch[i].state, MT_RELEASED)) {
                        timersub(&hs->evtime, &ms->touch[i].down, &tv);
        foreach_bit(i, ms->touch_used) {
                if (GETBIT(ms->touch[i].state, MT_RELEASED)) {
                        timersub(&hs->evtime, &ms->touch[i].down, &tv);

-                       xf86Msg(X_INFO, "  released p(%d, %d) d(%d, %d) dir(%f) down(%llu) time(%lld)\n",
+                       xf86Msg(X_INFO, "  released p(%d, %d) d(%d, %d) dir(%f) down(%llu) state("PRBITMASK") time(%lld)\n",

                                                ms->touch[i].x, ms->touch[i].y, ms->touch[i].dx, ms->touch[i].dy,
                                                ms->touch[i].x, ms->touch[i].y, ms->touch[i].dx, ms->touch[i].dy,

-                                               ms->touch[i].direction, timertoms(&ms->touch[i].down), timertoms(&tv));
+                                               ms->touch[i].direction, timertoms(&ms->touch[i].down), ms->touch[i].state, timertoms(&tv));

                }
                else if (GETBIT(ms->touch[i].state, MT_NEW)) {
                }
                else if (GETBIT(ms->touch[i].state, MT_NEW)) {

-                       xf86Msg(X_INFO, "  new      p(%d, %d) d(%d, %d) dir(%f) down(%llu)\n",
+                       xf86Msg(X_INFO, "  new      p(%d, %d) d(%d, %d) dir(%f) down(%llu) state("PRBITMASK")\n",

                                                ms->touch[i].x, ms->touch[i].y, ms->touch[i].dx, ms->touch[i].dy,
                                                ms->touch[i].x, ms->touch[i].y, ms->touch[i].dx, ms->touch[i].dy,

-                                               ms->touch[i].direction, timertoms(&ms->touch[i].down));
+                                               ms->touch[i].direction, timertoms(&ms->touch[i].down), ms->touch[i].state);

                }
                else if (GETBIT(ms->touch[i].state, MT_INVALID)) {
                        timersub(&hs->evtime, &ms->touch[i].down, &tv);
                }
                else if (GETBIT(ms->touch[i].state, MT_INVALID)) {
                        timersub(&hs->evtime, &ms->touch[i].down, &tv);

-                       xf86Msg(X_INFO, "  invalid  p(%d, %d) d(%d, %d) dir(%f) down(%llu) time(%lld)\n",
+                       xf86Msg(X_INFO, "  invalid  p(%d, %d) d(%d, %d) dir(%f) down(%llu) state("PRBITMASK") time(%lld)\n",

                                                ms->touch[i].x, ms->touch[i].y, ms->touch[i].dx, ms->touch[i].dy,
                                                ms->touch[i].x, ms->touch[i].y, ms->touch[i].dx, ms->touch[i].dy,

-                                               ms->touch[i].direction, timertoms(&ms->touch[i].down), timertoms(&tv));
+                                               ms->touch[i].direction, timertoms(&ms->touch[i].down), ms->touch[i].state, timertoms(&tv));

                }
                else {
                }
                else {

-                       xf86Msg(X_INFO, "  touching p(%d, %d) d(%d, %d) dir(%f) down(%llu)\n",
+                       xf86Msg(X_INFO, "  touching p(%d, %d) d(%d, %d) dir(%f) down(%llu) state("PRBITMASK")\n",

                                                ms->touch[i].x, ms->touch[i].y, ms->touch[i].dx, ms->touch[i].dy,
                                                ms->touch[i].x, ms->touch[i].y, ms->touch[i].dx, ms->touch[i].dy,

-                                               ms->touch[i].direction, timertoms(&ms->touch[i].down));
+                                               ms->touch[i].direction, timertoms(&ms->touch[i].down), ms->touch[i].state);

                }
        }
 }
                }
        }
 }