Added some debug logging to print out every event added to the SDL queue.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255
diff --git a/src/events/SDL_events.c b/src/events/SDL_events.c
index 2f5b0af..98f9a3b 100644
--- a/src/events/SDL_events.c
+++ b/src/events/SDL_events.c
@@ -33,6 +33,8 @@
#endif
#include "../video/SDL_sysvideo.h"
+/*#define SDL_DEBUG_EVENTS 1*/
+
/* An arbitrary limit so we don't have unbounded growth */
#define SDL_MAX_QUEUED_EVENTS 65535
@@ -84,6 +86,230 @@ static struct
} SDL_EventQ = { NULL, { 1 }, { 0 }, 0, NULL, NULL, NULL, NULL, NULL };
+#ifdef SDL_DEBUG_EVENTS
+
+/* this is to make printf() calls cleaner. */
+#define uint unsigned int
+
+static void
+SDL_DebugPrintEvent(const SDL_Event *event)
+{
+ /* !!! FIXME: This code is kinda ugly, sorry. */
+ printf("SDL EVENT: ");
+
+ if ((event->type >= SDL_USEREVENT) && (event->type <= SDL_LASTEVENT)) {
+ printf("SDL_USEREVENT");
+ if (event->type > SDL_USEREVENT) {
+ printf("+%u", ((uint) event->type) - SDL_USEREVENT);
+ }
+ printf(" (timestamp=%u windowid=%u code=%d data1=%p data2=%p)",
+ (uint) event->user.timestamp, (uint) event->user.windowID,
+ (int) event->user.code, event->user.data1, event->user.data2);
+ return;
+ }
+
+ switch (event->type) {
+ #define SDL_EVENT_CASE(x) case x: printf("%s", #x);
+ SDL_EVENT_CASE(SDL_FIRSTEVENT) printf("(THIS IS PROBABLY A BUG!)"); break;
+ SDL_EVENT_CASE(SDL_QUIT) printf("(timestamp=%u)", (uint) event->quit.timestamp); break;
+ SDL_EVENT_CASE(SDL_APP_TERMINATING) break;
+ SDL_EVENT_CASE(SDL_APP_LOWMEMORY) break;
+ SDL_EVENT_CASE(SDL_APP_WILLENTERBACKGROUND) break;
+ SDL_EVENT_CASE(SDL_APP_DIDENTERBACKGROUND) break;
+ SDL_EVENT_CASE(SDL_APP_WILLENTERFOREGROUND) break;
+ SDL_EVENT_CASE(SDL_APP_DIDENTERFOREGROUND) break;
+ SDL_EVENT_CASE(SDL_KEYMAPCHANGED) break;
+ SDL_EVENT_CASE(SDL_CLIPBOARDUPDATE); break;
+ SDL_EVENT_CASE(SDL_RENDER_TARGETS_RESET) break;
+ SDL_EVENT_CASE(SDL_RENDER_DEVICE_RESET) break;
+ #undef SDL_EVENT_CASE
+
+ #define SDL_EVENT_CASE(x) case x: printf("%s ", #x);
+
+ SDL_EVENT_CASE(SDL_WINDOWEVENT)
+ printf("(timestamp=%u windowid=%u event=", (uint) event->window.timestamp, (uint) event->window.windowID);
+ switch(event->window.event) {
+ case SDL_WINDOWEVENT_NONE: printf("none(THIS IS PROBABLY A BUG!)"); break;
+ #define SDL_WINDOWEVENT_CASE(x) case x: printf("%s", #x); break
+ SDL_WINDOWEVENT_CASE(SDL_WINDOWEVENT_SHOWN);
+ SDL_WINDOWEVENT_CASE(SDL_WINDOWEVENT_HIDDEN);
+ SDL_WINDOWEVENT_CASE(SDL_WINDOWEVENT_EXPOSED);
+ SDL_WINDOWEVENT_CASE(SDL_WINDOWEVENT_MOVED);
+ SDL_WINDOWEVENT_CASE(SDL_WINDOWEVENT_RESIZED);
+ SDL_WINDOWEVENT_CASE(SDL_WINDOWEVENT_SIZE_CHANGED);
+ SDL_WINDOWEVENT_CASE(SDL_WINDOWEVENT_MINIMIZED);
+ SDL_WINDOWEVENT_CASE(SDL_WINDOWEVENT_MAXIMIZED);
+ SDL_WINDOWEVENT_CASE(SDL_WINDOWEVENT_RESTORED);
+ SDL_WINDOWEVENT_CASE(SDL_WINDOWEVENT_ENTER);
+ SDL_WINDOWEVENT_CASE(SDL_WINDOWEVENT_LEAVE);
+ SDL_WINDOWEVENT_CASE(SDL_WINDOWEVENT_FOCUS_GAINED);
+ SDL_WINDOWEVENT_CASE(SDL_WINDOWEVENT_FOCUS_LOST);
+ SDL_WINDOWEVENT_CASE(SDL_WINDOWEVENT_CLOSE);
+ SDL_WINDOWEVENT_CASE(SDL_WINDOWEVENT_TAKE_FOCUS);
+ SDL_WINDOWEVENT_CASE(SDL_WINDOWEVENT_HIT_TEST);
+ #undef SDL_WINDOWEVENT_CASE
+ default: printf("UNKNOWN(bug? fixme?)"); break;
+ }
+ printf(" data1=%d data2=%d)", (int) event->window.data1, (int) event->window.data2);
+ break;
+
+ SDL_EVENT_CASE(SDL_SYSWMEVENT)
+ printf("(timestamp=%u)", (uint) event->syswm.timestamp);
+ /* !!! FIXME: we don't delve further at the moment. */
+ break;
+
+ #define PRINT_KEY_EVENT(event) \
+ printf("(timestamp=%u windowid=%u state=%s repeat=%s scancode=%u keycode=%u mod=%u)", \
+ (uint) event->key.timestamp, (uint) event->key.windowID, \
+ event->key.state == SDL_PRESSED ? "pressed" : "released", \
+ event->key.repeat ? "true" : "false", \
+ (uint) event->key.keysym.scancode, \
+ (uint) event->key.keysym.sym, \
+ (uint) event->key.keysym.mod)
+ SDL_EVENT_CASE(SDL_KEYDOWN) PRINT_KEY_EVENT(event); break;
+ SDL_EVENT_CASE(SDL_KEYUP) PRINT_KEY_EVENT(event); break;
+ #undef PRINT_KEY_EVENT
+
+ SDL_EVENT_CASE(SDL_TEXTEDITING)
+ printf("(timestamp=%u windowid=%u text='%s' start=%d length=%d)",
+ (uint) event->edit.timestamp, (uint) event->edit.windowID,
+ event->edit.text, (int) event->edit.start, (int) event->edit.length);
+ break;
+
+ SDL_EVENT_CASE(SDL_TEXTINPUT)
+ printf("(timestamp=%u windowid=%u text='%s')", (uint) event->text.timestamp, (uint) event->text.windowID, event->text.text);
+ break;
+
+
+ SDL_EVENT_CASE(SDL_MOUSEMOTION)
+ printf("(timestamp=%u windowid=%u which=%u state=%u x=%d y=%d xrel=%d yrel=%d)",
+ (uint) event->motion.timestamp, (uint) event->motion.windowID,
+ (uint) event->motion.which, (uint) event->motion.state,
+ (int) event->motion.x, (int) event->motion.y,
+ (int) event->motion.xrel, (int) event->motion.yrel);
+ break;
+
+ #define PRINT_MBUTTON_EVENT(event) \
+ printf("(timestamp=%u windowid=%u which=%u button=%u state=%s clicks=%u x=%d y=%d)", \
+ (uint) event->button.timestamp, (uint) event->button.windowID, \
+ (uint) event->button.which, (uint) event->button.button, \
+ event->button.state == SDL_PRESSED ? "pressed" : "released", \
+ (uint) event->button.clicks, (int) event->button.x, (int) event->button.y)
+ SDL_EVENT_CASE(SDL_MOUSEBUTTONDOWN) PRINT_MBUTTON_EVENT(event); break;
+ SDL_EVENT_CASE(SDL_MOUSEBUTTONUP) PRINT_MBUTTON_EVENT(event); break;
+ #undef PRINT_MBUTTON_EVENT
+
+
+ SDL_EVENT_CASE(SDL_MOUSEWHEEL)
+ printf("(timestamp=%u windowid=%u which=%u x=%d y=%d direction=%s)",
+ (uint) event->wheel.timestamp, (uint) event->wheel.windowID,
+ (uint) event->wheel.which, (int) event->wheel.x, (int) event->wheel.y,
+ event->wheel.direction == SDL_MOUSEWHEEL_NORMAL ? "normal" : "flipped");
+ break;
+
+ SDL_EVENT_CASE(SDL_JOYAXISMOTION)
+ printf("(timestamp=%u which=%d axis=%u value=%d)",
+ (uint) event->jaxis.timestamp, (int) event->jaxis.which,
+ (uint) event->jaxis.axis, (int) event->jaxis.value);
+ break;
+
+ SDL_EVENT_CASE(SDL_JOYBALLMOTION)
+ printf("(timestamp=%u which=%d ball=%u xrel=%d yrel=%d)",
+ (uint) event->jball.timestamp, (int) event->jball.which,
+ (uint) event->jball.ball, (int) event->jball.xrel, (int) event->jball.yrel);
+ break;
+
+ SDL_EVENT_CASE(SDL_JOYHATMOTION)
+ printf("(timestamp=%u which=%d hat=%u value=%u)",
+ (uint) event->jhat.timestamp, (int) event->jhat.which,
+ (uint) event->jhat.hat, (uint) event->jhat.value);
+ break;
+
+ #define PRINT_JBUTTON_EVENT(event) \
+ printf("(timestamp=%u which=%d button=%u state=%s)", \
+ (uint) event->jbutton.timestamp, (int) event->jbutton.which, \
+ (uint) event->jbutton.button, event->jbutton.state == SDL_PRESSED ? "pressed" : "released")
+ SDL_EVENT_CASE(SDL_JOYBUTTONDOWN) PRINT_JBUTTON_EVENT(event); break;
+ SDL_EVENT_CASE(SDL_JOYBUTTONUP) PRINT_JBUTTON_EVENT(event); break;
+ #undef PRINT_JBUTTON_EVENT
+
+ #define PRINT_JOYDEV_EVENT(event) printf("(timestamp=%u which=%d)", (uint) event->jdevice.timestamp, (int) event->jdevice.which)
+ SDL_EVENT_CASE(SDL_JOYDEVICEADDED) PRINT_JOYDEV_EVENT(event); break;
+ SDL_EVENT_CASE(SDL_JOYDEVICEREMOVED) PRINT_JOYDEV_EVENT(event); break;
+ #undef PRINT_JOYDEV_EVENT
+
+ SDL_EVENT_CASE(SDL_CONTROLLERAXISMOTION)
+ printf("(timestamp=%u which=%d axis=%u value=%d)",
+ (uint) event->caxis.timestamp, (int) event->caxis.which,
+ (uint) event->caxis.axis, (int) event->caxis.value);
+ break;
+
+ #define PRINT_CBUTTON_EVENT(event) \
+ printf("(timestamp=%u which=%d button=%u state=%s)", \
+ (uint) event->cbutton.timestamp, (int) event->cbutton.which, \
+ (uint) event->cbutton.button, event->cbutton.state == SDL_PRESSED ? "pressed" : "released")
+ SDL_EVENT_CASE(SDL_CONTROLLERBUTTONDOWN) PRINT_CBUTTON_EVENT(event); break;
+ SDL_EVENT_CASE(SDL_CONTROLLERBUTTONUP) PRINT_CBUTTON_EVENT(event); break;
+ #undef PRINT_CBUTTON_EVENT
+
+ #define PRINT_CONTROLLERDEV_EVENT(event) printf("(timestamp=%u which=%d)", (uint) event->cdevice.timestamp, (int) event->cdevice.which)
+ SDL_EVENT_CASE(SDL_CONTROLLERDEVICEADDED) PRINT_CONTROLLERDEV_EVENT(event); break;
+ SDL_EVENT_CASE(SDL_CONTROLLERDEVICEREMOVED) PRINT_CONTROLLERDEV_EVENT(event); break;
+ SDL_EVENT_CASE(SDL_CONTROLLERDEVICEREMAPPED) PRINT_CONTROLLERDEV_EVENT(event); break;
+ #undef PRINT_CONTROLLERDEV_EVENT
+
+ #define PRINT_FINGER_EVENT(event) \
+ printf("(timestamp=%u touchid=%lld fingerid=%lld x=%f y=%f dx=%f dy=%f pressure=%f)", \
+ (uint) event->tfinger.timestamp, (long long) event->tfinger.touchId, \
+ (long long) event->tfinger.fingerId, event->tfinger.x, event->tfinger.y, \
+ event->tfinger.dx, event->tfinger.dy, event->tfinger.pressure)
+ SDL_EVENT_CASE(SDL_FINGERDOWN) PRINT_FINGER_EVENT(event); break;
+ SDL_EVENT_CASE(SDL_FINGERUP) PRINT_FINGER_EVENT(event); break;
+ SDL_EVENT_CASE(SDL_FINGERMOTION) PRINT_FINGER_EVENT(event); break;
+ #undef PRINT_FINGER_EVENT
+
+ #define PRINT_DOLLAR_EVENT(event) \
+ printf("(timestamp=%u touchid=%lld gestureid=%lld numfingers=%u error=%f x=%f y=%f)", \
+ (uint) event->dgesture.timestamp, (long long) event->dgesture.touchId, \
+ (long long) event->dgesture.gestureId, (uint) event->dgesture.numFingers, \
+ event->dgesture.error, event->dgesture.x, event->dgesture.y);
+ SDL_EVENT_CASE(SDL_DOLLARGESTURE) PRINT_DOLLAR_EVENT(event); break;
+ SDL_EVENT_CASE(SDL_DOLLARRECORD) PRINT_DOLLAR_EVENT(event); break;
+ #undef PRINT_DOLLAR_EVENT
+
+ SDL_EVENT_CASE(SDL_MULTIGESTURE)
+ printf("(timestamp=%u touchid=%lld dtheta=%f ddist=%f x=%f y=%f numfingers=%u)",
+ (uint) event->mgesture.timestamp, (long long) event->mgesture.touchId,
+ event->mgesture.dTheta, event->mgesture.dDist,
+ event->mgesture.x, event->mgesture.y, (uint) event->mgesture.numFingers);
+ break;
+
+ #define PRINT_DROP_EVENT(event) printf("(file='%s' timestamp=%u windowid=%u)", event->drop.file, (uint) event->drop.timestamp, (uint) event->drop.windowID)
+ SDL_EVENT_CASE(SDL_DROPFILE) PRINT_DROP_EVENT(event); break;
+ SDL_EVENT_CASE(SDL_DROPTEXT) PRINT_DROP_EVENT(event); break;
+ SDL_EVENT_CASE(SDL_DROPBEGIN) PRINT_DROP_EVENT(event); break;
+ SDL_EVENT_CASE(SDL_DROPCOMPLETE) PRINT_DROP_EVENT(event); break;
+ #undef PRINT_DROP_EVENT
+
+ #define PRINT_AUDIODEV_EVENT(event) printf("(timestamp=%u which=%u iscapture=%s)", (uint) event->adevice.timestamp, (uint) event->adevice.which, event->adevice.iscapture ? "true" : "false");
+ SDL_EVENT_CASE(SDL_AUDIODEVICEADDED) PRINT_AUDIODEV_EVENT(event); break;
+ SDL_EVENT_CASE(SDL_AUDIODEVICEREMOVED) PRINT_AUDIODEV_EVENT(event); break;
+ #undef PRINT_AUDIODEV_EVENT
+
+ #undef SDL_EVENT_CASE
+
+ default:
+ printf("UNKNOWN SDL EVENT #%u! (Bug? FIXME?)", (uint) event->type);
+ break;
+ }
+
+ printf("\n");
+}
+#undef uint
+#endif
+
+
+
/* Public functions */
void
@@ -209,6 +435,10 @@ SDL_AddEvent(SDL_Event * event)
SDL_EventQ.free = entry->next;
}
+ #ifdef SDL_DEBUG_EVENTS
+ SDL_DebugPrintEvent(event);
+ #endif
+
entry->event = *event;
if (event->type == SDL_SYSWMEVENT) {
entry->msg = *event->syswm.msg;