[BOX32][WRAPPER] More work on SDL2 Wrapping(but TheStanleyParable still don't have mouse input working)

1 files changed, 131 insertions, 74 deletions

diff --git a/src/libtools/sdl2align32.c b/src/libtools/sdl2align32.c
index 7eac83fa..93da8c69 100644
--- a/src/libtools/sdl2align32.c
+++ b/src/libtools/sdl2align32.c
@@ -57,124 +57,147 @@ void convert_SDL2_DisplayMode_to_64(void* dst_, void* src_)
 
 void convert_SDL2_Event_to_64(void* dst_, const void* src_)
 {
+    // in reverse order so it can be done inplace...
     if (!src_ || !dst_) return;
     const my_SDL2_Event_32_t* src = src_;
     my_SDL2_Event_t* dst = dst_;
-    dst->type = src->type;
     switch (src->type) {
         case SDL2_WINDOWEVENT:
-            dst->window.type = src->window.type;
-            dst->window.timestamp = src->window.timestamp;
-            dst->window.windowID = src->window.windowID;
-            dst->window.event = src->window.event;
-            dst->window.padding1 = src->window.padding1;
-            dst->window.padding2 = src->window.padding2;
-            dst->window.padding3 = src->window.padding3;
-            dst->window.data1 = src->window.data1;
             dst->window.data2 = src->window.data2;
+            dst->window.data1 = src->window.data1;
+            dst->window.padding3 = src->window.padding3;
+            dst->window.padding2 = src->window.padding2;
+            dst->window.padding1 = src->window.padding1;
+            dst->window.event = src->window.event;
+            dst->window.windowID = src->window.windowID;
+            dst->window.timestamp = src->window.timestamp;
+            dst->window.type = src->window.type;
             break;
         case SDL2_MOUSEMOTION:
-            dst->motion.type = src->motion.type;
-            dst->motion.timestamp = src->motion.timestamp;
-            dst->motion.windowID = src->motion.windowID;
-            dst->motion.which = src->motion.which;
-            dst->motion.state = src->motion.state;
-            dst->motion.x = src->motion.x;
-            dst->motion.y = src->motion.y;
-            dst->motion.xrel = src->motion.xrel;
             dst->motion.yrel = src->motion.yrel;
+            dst->motion.xrel = src->motion.xrel;
+            dst->motion.y = src->motion.y;
+            dst->motion.x = src->motion.x;
+            dst->motion.state = src->motion.state;
+            dst->motion.which = src->motion.which;
+            dst->motion.windowID = src->motion.windowID;
+            dst->motion.timestamp = src->motion.timestamp;
+            dst->motion.type = src->motion.type;
             break;
         case SDL2_MOUSEBUTTONDOWN:
         case SDL2_MOUSEBUTTONUP:
-            dst->button.type = src->button.type;
-            dst->button.timestamp = src->button.timestamp;
-            dst->button.windowID = src->button.windowID;
-            dst->button.which = src->button.which;
-            dst->button.button = src->button.button;
-            dst->button.state = src->button.state;
-            dst->button.clicks = src->button.clicks;
-            dst->button.padding1 = src->button.padding1;
-            dst->button.x = src->button.x;
             dst->button.y = src->button.y;
+            dst->button.x = src->button.x;
+            dst->button.padding1 = src->button.padding1;
+            dst->button.clicks = src->button.clicks;
+            dst->button.state = src->button.state;
+            dst->button.button = src->button.button;
+            dst->button.which = src->button.which;
+            dst->button.windowID = src->button.windowID;
+            dst->button.timestamp = src->button.timestamp;
+            dst->button.type = src->button.type;
             break;
         case SDL2_AUDIODEVICEADDED:
         case SDL2_AUDIODEVICEREMOVED:
-            dst->adevice.type = src->adevice.type;
-            dst->adevice.timestamp = src->adevice.timestamp;
-            dst->adevice.which = src->adevice.which;
-            dst->adevice.iscapture = src->adevice.iscapture;
-            dst->adevice.padding1 = src->adevice.padding1;
-            dst->adevice.padding2 = src->adevice.padding2;
             dst->adevice.padding3 = src->adevice.padding3;
+            dst->adevice.padding2 = src->adevice.padding2;
+            dst->adevice.padding1 = src->adevice.padding1;
+            dst->adevice.iscapture = src->adevice.iscapture;
+            dst->adevice.which = src->adevice.which;
+            dst->adevice.timestamp = src->adevice.timestamp;
+            dst->adevice.type = src->adevice.type;
             break;
         case SDL2_KEYDOWN:
         case SDL2_KEYUP:
-            dst->key.type = src->key.type;
-            dst->key.timestamp = src->key.timestamp;
-            dst->key.windowID = src->key.windowID;
-            dst->key.state = src->key.state;
-            dst->key.repeat = src->key.repeat;
-            dst->key.padding2 = src->key.padding2;
-            dst->key.padding3 = src->key.padding3;
-            dst->key.keysym.scancode = src->key.keysym.scancode;
-            dst->key.keysym.sym = src->key.keysym.sym;
-            dst->key.keysym.mod = src->key.keysym.mod;
             dst->key.keysym.unused = src->key.keysym.unused;
+            dst->key.keysym.mod = src->key.keysym.mod;
+            dst->key.keysym.sym = src->key.keysym.sym;
+            dst->key.keysym.scancode = src->key.keysym.scancode;
+            dst->key.padding3 = src->key.padding3;
+            dst->key.padding2 = src->key.padding2;
+            dst->key.repeat = src->key.repeat;
+            dst->key.state = src->key.state;
+            dst->key.windowID = src->key.windowID;
+            dst->key.timestamp = src->key.timestamp;
+            dst->key.type = src->key.type;
             break;
         case SDL2_TEXTEDITING:
-            dst->edit.type = src->edit.type;
-            dst->edit.timestamp = src->edit.timestamp;
-            dst->edit.windowID = src->edit.windowID;
-            memcpy(dst->edit.text, src->edit.text, 32);
-            dst->edit.start = src->edit.start;
             dst->edit.length = src->edit.length;
+            dst->edit.start = src->edit.start;
+            memcpy(dst->edit.text, src->edit.text, 32);
+            dst->edit.windowID = src->edit.windowID;
+            dst->edit.timestamp = src->edit.timestamp;
+            dst->edit.type = src->edit.type;
             break;
         case SDL2_TEXTINPUT:
-            dst->text.type = src->text.type;
-            dst->text.timestamp = src->text.timestamp;
-            dst->text.windowID = src->text.windowID;
             memcpy(dst->text.text, src->text.text, 32);
+            dst->text.windowID = src->text.windowID;
+            dst->text.timestamp = src->text.timestamp;
+            dst->text.type = src->text.type;
             break;
         case SDL2_MOUSEWHEEL:
-            dst->wheel.type = src->wheel.type;
-            dst->wheel.timestamp = src->wheel.timestamp;
-            dst->wheel.windowID = src->wheel.windowID;
-            dst->wheel.which = src->wheel.which;
-            dst->wheel.x = src->wheel.x;
-            dst->wheel.y = src->wheel.y;
-            dst->wheel.direction = src->wheel.direction;
-            dst->wheel.preciseX = src->wheel.preciseX;
-            dst->wheel.preciseY = src->wheel.preciseY;
-            dst->wheel.mouseX = src->wheel.mouseX;
             dst->wheel.mouseY = src->wheel.mouseY;
+            dst->wheel.mouseX = src->wheel.mouseX;
+            dst->wheel.preciseY = src->wheel.preciseY;
+            dst->wheel.preciseX = src->wheel.preciseX;
+            dst->wheel.direction = src->wheel.direction;
+            dst->wheel.y = src->wheel.y;
+            dst->wheel.x = src->wheel.x;
+            dst->wheel.which = src->wheel.which;
+            dst->wheel.windowID = src->wheel.windowID;
+            dst->wheel.timestamp = src->wheel.timestamp;
+            dst->wheel.type = src->wheel.type;
             break;
         case SDL2_POLLSENTINEL:
-            dst->common.type = src->common.type;
             dst->common.timestamp = src->common.timestamp;
+            dst->common.type = src->common.type;
             break;
         case SDL2_DISPLAYEVENT:
-            dst->display.type = src->display.type;
-            dst->display.timestamp = src->display.timestamp;
-            dst->display.display = src->display.display;
-            dst->display.event = src->display.event;
-            dst->display.padding1 = src->display.padding1;
-            dst->display.padding2 = src->display.padding2;
-            dst->display.padding3 = src->display.padding3;
             dst->display.data1 = src->display.data1;
+            dst->display.padding3 = src->display.padding3;
+            dst->display.padding2 = src->display.padding2;
+            dst->display.padding1 = src->display.padding1;
+            dst->display.event = src->display.event;
+            dst->display.display = src->display.display;
+            dst->display.timestamp = src->display.timestamp;
+            dst->display.type = src->display.type;
             break;
         case SDL2_JOYDEVICEADDED:
-            dst->jdevice.type = src->jdevice.type;
-            dst->jdevice.timestamp = src->jdevice.timestamp;
             dst->jdevice.which = src->jdevice.which;
+            dst->jdevice.timestamp = src->jdevice.timestamp;
+            dst->jdevice.type = src->jdevice.type;
             break;
         case SDL2_CONTROLLERDEVICEADDED:
-            dst->cdevice.type = src->cdevice.type;
-            dst->cdevice.timestamp = src->cdevice.timestamp;
             dst->cdevice.which = src->cdevice.which;
+            dst->cdevice.timestamp = src->cdevice.timestamp;
+            dst->cdevice.type = src->cdevice.type;
+            break;
+        case SDL2_JOYAXISMOTION:
+            dst->jaxis.padding4 = src->jaxis.padding4;
+            dst->jaxis.value = src->jaxis.value;
+            dst->jaxis.padding3 = src->jaxis.padding3;
+            dst->jaxis.padding2 = src->jaxis.padding2;
+            dst->jaxis.padding1 = src->jaxis.padding1;
+            dst->jaxis.axis = src->jaxis.axis;
+            dst->jaxis.which = src->jaxis.which;
+            dst->jaxis.timestamp = src->jaxis.timestamp;
+            dst->jaxis.type = src->jaxis.type;
+            break;
+        case SDL2_CONTROLLERAXISMOTION:
+            dst->caxis.padding4 = src->caxis.padding4;
+            dst->caxis.value = src->caxis.value;
+            dst->caxis.padding3 = src->caxis.padding3;
+            dst->caxis.padding2 = src->caxis.padding2;
+            dst->caxis.padding1 = src->caxis.padding1;
+            dst->caxis.axis = src->caxis.axis;
+            dst->caxis.which = src->caxis.which;
+            dst->caxis.timestamp = src->caxis.timestamp;
+            dst->caxis.type = src->caxis.type;
             break;
         default:
             printf_log(LOG_INFO, "Warning, unsuported SDL2 event %d\n", src->type);
-            memcpy(dst, src, sizeof(my_SDL2_Event_32_t));
+            if(dst_!=src_)
+                memmove(dst, src, sizeof(my_SDL2_Event_32_t));
     }
 }
 void convert_SDL2_Event_to_32(void* dst_, const void* src_)
@@ -294,12 +317,46 @@ void convert_SDL2_Event_to_32(void* dst_, const void* src_)
             dst->cdevice.timestamp = src->cdevice.timestamp;
             dst->cdevice.which = src->cdevice.which;
             break;
+        case SDL2_JOYAXISMOTION:
+            dst->jaxis.type = src->jaxis.type;
+            dst->jaxis.timestamp = src->jaxis.timestamp;
+            dst->jaxis.which = src->jaxis.which;
+            dst->jaxis.axis = src->jaxis.axis;
+            dst->jaxis.padding1 = src->jaxis.padding1;
+            dst->jaxis.padding2 = src->jaxis.padding2;
+            dst->jaxis.padding3 = src->jaxis.padding3;
+            dst->jaxis.value = src->jaxis.value;
+            dst->jaxis.padding4 = src->jaxis.padding4;
+            break;
+        case SDL2_CONTROLLERAXISMOTION:
+            dst->caxis.type = src->caxis.type;
+            dst->caxis.timestamp = src->caxis.timestamp;
+            dst->caxis.which = src->caxis.which;
+            dst->caxis.axis = src->caxis.axis;
+            dst->caxis.padding1 = src->caxis.padding1;
+            dst->caxis.padding2 = src->caxis.padding2;
+            dst->caxis.padding3 = src->caxis.padding3;
+            dst->caxis.value = src->caxis.value;
+            dst->caxis.padding4 = src->caxis.padding4;
+            break;
         default:
             printf_log(LOG_INFO, "Warning, unsuported SDL2 event %d\n", src->type);
-            memcpy(dst, src, sizeof(my_SDL2_Event_32_t));
+            if(dst_!=src_)
+                memmove(dst, src, sizeof(my_SDL2_Event_32_t));
     }
 }
 
+void inplace_SDL2_Event_shrink(void* e)
+{
+    if(!e) return;
+    convert_SDL2_Event_to_32(e, e);
+}
+void inplace_SDL2_Event_enlarge(void* e)
+{
+    if(!e) return;
+    convert_SDL2_Event_to_64(e, e);
+}
+
 void inplace_SDL2_Palette_to_32(void* a)
 {
     if (!a) return;