[WRAPEPR] Reworked wrapping of libgdk3

6 files changed, 349 insertions, 467 deletions

diff --git a/src/wrapped/generated/functions_list.txt b/src/wrapped/generated/functions_list.txt
index 1e0439a2..24609a4c 100644
--- a/src/wrapped/generated/functions_list.txt
+++ b/src/wrapped/generated/functions_list.txt
@@ -1245,7 +1245,6 @@
 #() pFiipi
 #() pFiIIi
 #() pFillu
-#() pFipii
 #() pFipip
 #() pFippi
 #() pFippu
@@ -1760,7 +1759,6 @@
 #() pFEpppV
 #() pFEpppA
 #() pFiiiii
-#() pFiiipL
 #() pFipipL
 #() pFipipp
 #() pFuiiiu
@@ -1969,6 +1967,7 @@
 #() vFpLLLLu
 #() vFpLpLLL
 #() vFppiiii
+#() vFppiiiu
 #() vFppiiip
 #() vFppiiuu
 #() vFppiipi
@@ -2349,6 +2348,7 @@
 #() vFpuuUUuu
 #() vFpuupupu
 #() vFpuupppp
+#() vFpupiiiu
 #() vFpupuuup
 #() vFpupppui
 #() vFpUiUiup
@@ -2370,6 +2370,7 @@
 #() vFppipppp
 #() vFppCuupp
 #() vFppuiiip
+#() vFppuuuii
 #() vFppuupii
 #() vFppupipp
 #() vFppUuupp
@@ -2495,6 +2496,7 @@
 #() uFpuupppp
 #() uFppiuppi
 #() uFppiuppp
+#() uFppuiupu
 #() uFppuuuup
 #() uFppppppp
 #() uFbCuuuuu
@@ -2932,7 +2934,6 @@
 #() vFffffffffff
 #() vFpiuippppip
 #() vFpuupuuuuuu
-#() vFppiiiiipip
 #() vFppiiiiupip
 #() vFppuipppiip
 #() vFppuuuiiiii
@@ -3055,7 +3056,6 @@
 #() vFppiipppiiiii
 #() vFppuuppuiiiii
 #() vFppuupppiiiiu
-#() vFpppiiiiiiiii
 #() vFpppiiiiiiuii
 #() vFpppppppppppp
 #() iFEpppippppppp
@@ -3083,7 +3083,6 @@
 #() vFpipppiiiiiiuu
 #() vFpippppppppppp
 #() vFpuppppppppppp
-#() vFppiiiiiiiiiii
 #() vFppiiiiiiuiuii
 #() vFppuuppiiiiuii
 #() vFppuupppuiiiii
@@ -3456,12 +3455,8 @@ wrappedgdk3:
   - gdk_event_handler_set
   - gdk_window_add_filter
   - gdk_window_remove_filter
-- iFiipp:
-  - gdk_input_add
 - uFippp:
   - gdk_threads_add_idle_full
-- iFiippp:
-  - gdk_input_add_full
 - uFiuppp:
   - gdk_threads_add_timeout_full
 wrappedgdkpixbuf2:
diff --git a/src/wrapped/generated/wrappedgdk3types.h b/src/wrapped/generated/wrappedgdk3types.h
index eff1d72f..bd2f42b8 100644
--- a/src/wrapped/generated/wrappedgdk3types.h
+++ b/src/wrapped/generated/wrappedgdk3types.h
@@ -15,9 +15,7 @@ typedef void (*vFpp_t)(void*, void*);
 typedef int32_t (*iFpp_t)(void*, void*);
 typedef uint32_t (*uFpp_t)(void*, void*);
 typedef void (*vFppp_t)(void*, void*, void*);
-typedef int32_t (*iFiipp_t)(int32_t, int32_t, void*, void*);
 typedef uint32_t (*uFippp_t)(int32_t, void*, void*, void*);
-typedef int32_t (*iFiippp_t)(int32_t, int32_t, void*, void*, void*);
 typedef uint32_t (*uFiuppp_t)(int32_t, uint32_t, void*, void*, void*);
 
 #define SUPER() ADDED_FUNCTIONS() \
@@ -28,9 +26,7 @@ typedef uint32_t (*uFiuppp_t)(int32_t, uint32_t, void*, void*, void*);
 	GO(gdk_event_handler_set, vFppp_t) \
 	GO(gdk_window_add_filter, vFppp_t) \
 	GO(gdk_window_remove_filter, vFppp_t) \
-	GO(gdk_input_add, iFiipp_t) \
 	GO(gdk_threads_add_idle_full, uFippp_t) \
-	GO(gdk_input_add_full, iFiippp_t) \
 	GO(gdk_threads_add_timeout_full, uFiuppp_t)
 
 #endif // __wrappedgdk3TYPES_H_
diff --git a/src/wrapped/generated/wrapper.c b/src/wrapped/generated/wrapper.c
index 38d1824c..ada9a9f0 100644
--- a/src/wrapped/generated/wrapper.c
+++ b/src/wrapped/generated/wrapper.c
@@ -1275,7 +1275,6 @@ typedef void* (*pFiiLp_t)(int32_t, int32_t, uintptr_t, void*);
 typedef void* (*pFiipi_t)(int32_t, int32_t, void*, int32_t);
 typedef void* (*pFiIIi_t)(int32_t, int64_t, int64_t, int32_t);
 typedef void* (*pFillu_t)(int32_t, intptr_t, intptr_t, uint32_t);
-typedef void* (*pFipii_t)(int32_t, void*, int32_t, int32_t);
 typedef void* (*pFipip_t)(int32_t, void*, int32_t, void*);
 typedef void* (*pFippi_t)(int32_t, void*, void*, int32_t);
 typedef void* (*pFippu_t)(int32_t, void*, void*, uint32_t);
@@ -1789,7 +1788,6 @@ typedef void* (*pFEpppp_t)(x64emu_t*, void*, void*, void*, void*);
 typedef void* (*pFEpppV_t)(x64emu_t*, void*, void*, void*, void*);
 typedef void* (*pFEpppA_t)(x64emu_t*, void*, void*, void*, void*);
 typedef void* (*pFiiiii_t)(int32_t, int32_t, int32_t, int32_t, int32_t);
-typedef void* (*pFiiipL_t)(int32_t, int32_t, int32_t, void*, uintptr_t);
 typedef void* (*pFipipL_t)(int32_t, void*, int32_t, void*, uintptr_t);
 typedef void* (*pFipipp_t)(int32_t, void*, int32_t, void*, void*);
 typedef void* (*pFuiiiu_t)(uint32_t, int32_t, int32_t, int32_t, uint32_t);
@@ -1998,6 +1996,7 @@ typedef void (*vFpddddp_t)(void*, double, double, double, double, void*);
 typedef void (*vFpLLLLu_t)(void*, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uint32_t);
 typedef void (*vFpLpLLL_t)(void*, uintptr_t, void*, uintptr_t, uintptr_t, uintptr_t);
 typedef void (*vFppiiii_t)(void*, void*, int32_t, int32_t, int32_t, int32_t);
+typedef void (*vFppiiiu_t)(void*, void*, int32_t, int32_t, int32_t, uint32_t);
 typedef void (*vFppiiip_t)(void*, void*, int32_t, int32_t, int32_t, void*);
 typedef void (*vFppiiuu_t)(void*, void*, int32_t, int32_t, uint32_t, uint32_t);
 typedef void (*vFppiipi_t)(void*, void*, int32_t, int32_t, void*, int32_t);
@@ -2377,6 +2376,7 @@ typedef void (*vFpuuuuuu_t)(void*, uint32_t, uint32_t, uint32_t, uint32_t, uint3
 typedef void (*vFpuuUUuu_t)(void*, uint32_t, uint32_t, uint64_t, uint64_t, uint32_t, uint32_t);
 typedef void (*vFpuupupu_t)(void*, uint32_t, uint32_t, void*, uint32_t, void*, uint32_t);
 typedef void (*vFpuupppp_t)(void*, uint32_t, uint32_t, void*, void*, void*, void*);
+typedef void (*vFpupiiiu_t)(void*, uint32_t, void*, int32_t, int32_t, int32_t, uint32_t);
 typedef void (*vFpupuuup_t)(void*, uint32_t, void*, uint32_t, uint32_t, uint32_t, void*);
 typedef void (*vFpupppui_t)(void*, uint32_t, void*, void*, void*, uint32_t, int32_t);
 typedef void (*vFpUiUiup_t)(void*, uint64_t, int32_t, uint64_t, int32_t, uint32_t, void*);
@@ -2398,6 +2398,7 @@ typedef void (*vFppipipp_t)(void*, void*, int32_t, void*, int32_t, void*, void*)
 typedef void (*vFppipppp_t)(void*, void*, int32_t, void*, void*, void*, void*);
 typedef void (*vFppCuupp_t)(void*, void*, uint8_t, uint32_t, uint32_t, void*, void*);
 typedef void (*vFppuiiip_t)(void*, void*, uint32_t, int32_t, int32_t, int32_t, void*);
+typedef void (*vFppuuuii_t)(void*, void*, uint32_t, uint32_t, uint32_t, int32_t, int32_t);
 typedef void (*vFppuupii_t)(void*, void*, uint32_t, uint32_t, void*, int32_t, int32_t);
 typedef void (*vFppupipp_t)(void*, void*, uint32_t, void*, int32_t, void*, void*);
 typedef void (*vFppUuupp_t)(void*, void*, uint64_t, uint32_t, uint32_t, void*, void*);
@@ -2523,6 +2524,7 @@ typedef uint32_t (*uFpuuuppp_t)(void*, uint32_t, uint32_t, uint32_t, void*, void
 typedef uint32_t (*uFpuupppp_t)(void*, uint32_t, uint32_t, void*, void*, void*, void*);
 typedef uint32_t (*uFppiuppi_t)(void*, void*, int32_t, uint32_t, void*, void*, int32_t);
 typedef uint32_t (*uFppiuppp_t)(void*, void*, int32_t, uint32_t, void*, void*, void*);
+typedef uint32_t (*uFppuiupu_t)(void*, void*, uint32_t, int32_t, uint32_t, void*, uint32_t);
 typedef uint32_t (*uFppuuuup_t)(void*, void*, uint32_t, uint32_t, uint32_t, uint32_t, void*);
 typedef uint32_t (*uFppppppp_t)(void*, void*, void*, void*, void*, void*, void*);
 typedef uint32_t (*uFbCuuuuu_t)(void*, uint8_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t);
@@ -2959,7 +2961,6 @@ typedef void (*vFuddiiddiip_t)(uint32_t, double, double, int32_t, int32_t, doubl
 typedef void (*vFffffffffff_t)(float, float, float, float, float, float, float, float, float, float);
 typedef void (*vFpiuippppip_t)(void*, int32_t, uint32_t, int32_t, void*, void*, void*, void*, int32_t, void*);
 typedef void (*vFpuupuuuuuu_t)(void*, uint32_t, uint32_t, void*, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t);
-typedef void (*vFppiiiiipip_t)(void*, void*, int32_t, int32_t, int32_t, int32_t, int32_t, void*, int32_t, void*);
 typedef void (*vFppiiiiupip_t)(void*, void*, int32_t, int32_t, int32_t, int32_t, uint32_t, void*, int32_t, void*);
 typedef void (*vFppuipppiip_t)(void*, void*, uint32_t, int32_t, void*, void*, void*, int32_t, int32_t, void*);
 typedef void (*vFppuuuiiiii_t)(void*, void*, uint32_t, uint32_t, uint32_t, int32_t, int32_t, int32_t, int32_t, int32_t);
@@ -3082,7 +3083,6 @@ typedef void (*vFppiiuuuiupup_t)(void*, void*, int32_t, int32_t, uint32_t, uint3
 typedef void (*vFppiipppiiiii_t)(void*, void*, int32_t, int32_t, void*, void*, void*, int32_t, int32_t, int32_t, int32_t, int32_t);
 typedef void (*vFppuuppuiiiii_t)(void*, void*, uint32_t, uint32_t, void*, void*, uint32_t, int32_t, int32_t, int32_t, int32_t, int32_t);
 typedef void (*vFppuupppiiiiu_t)(void*, void*, uint32_t, uint32_t, void*, void*, void*, int32_t, int32_t, int32_t, int32_t, uint32_t);
-typedef void (*vFpppiiiiiiiii_t)(void*, void*, void*, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t);
 typedef void (*vFpppiiiiiiuii_t)(void*, void*, void*, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, uint32_t, int32_t, int32_t);
 typedef void (*vFpppppppppppp_t)(void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*);
 typedef int32_t (*iFEpppippppppp_t)(x64emu_t*, void*, void*, void*, int32_t, void*, void*, void*, void*, void*, void*, void*);
@@ -3110,7 +3110,6 @@ typedef void (*vFuffffffffffff_t)(uint32_t, float, float, float, float, float, f
 typedef void (*vFpipppiiiiiiuu_t)(void*, int32_t, void*, void*, void*, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, uint32_t, uint32_t);
 typedef void (*vFpippppppppppp_t)(void*, int32_t, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*);
 typedef void (*vFpuppppppppppp_t)(void*, uint32_t, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*);
-typedef void (*vFppiiiiiiiiiii_t)(void*, void*, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t);
 typedef void (*vFppiiiiiiuiuii_t)(void*, void*, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, uint32_t, int32_t, uint32_t, int32_t, int32_t);
 typedef void (*vFppuuppiiiiuii_t)(void*, void*, uint32_t, uint32_t, void*, void*, int32_t, int32_t, int32_t, int32_t, uint32_t, int32_t, int32_t);
 typedef void (*vFppuupppuiiiii_t)(void*, void*, uint32_t, uint32_t, void*, void*, void*, uint32_t, int32_t, int32_t, int32_t, int32_t, int32_t);
@@ -4475,7 +4474,6 @@ void pFiiLp(x64emu_t *emu, uintptr_t fcn) { pFiiLp_t fn = (pFiiLp_t)fcn; R_RAX=(
 void pFiipi(x64emu_t *emu, uintptr_t fcn) { pFiipi_t fn = (pFiipi_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX); }
 void pFiIIi(x64emu_t *emu, uintptr_t fcn) { pFiIIi_t fn = (pFiIIi_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (int32_t)R_RCX); }
 void pFillu(x64emu_t *emu, uintptr_t fcn) { pFillu_t fn = (pFillu_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (intptr_t)R_RSI, (intptr_t)R_RDX, (uint32_t)R_RCX); }
-void pFipii(x64emu_t *emu, uintptr_t fcn) { pFipii_t fn = (pFipii_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX); }
 void pFipip(x64emu_t *emu, uintptr_t fcn) { pFipip_t fn = (pFipip_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX); }
 void pFippi(x64emu_t *emu, uintptr_t fcn) { pFippi_t fn = (pFippi_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX); }
 void pFippu(x64emu_t *emu, uintptr_t fcn) { pFippu_t fn = (pFippu_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint32_t)R_RCX); }
@@ -4989,7 +4987,6 @@ void pFEpppp(x64emu_t *emu, uintptr_t fcn) { pFEpppp_t fn = (pFEpppp_t)fcn; R_RA
 void pFEpppV(x64emu_t *emu, uintptr_t fcn) { pFEpppV_t fn = (pFEpppV_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)(R_RSP + 8)); }
 void pFEpppA(x64emu_t *emu, uintptr_t fcn) { pFEpppA_t fn = (pFEpppA_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void pFiiiii(x64emu_t *emu, uintptr_t fcn) { pFiiiii_t fn = (pFiiiii_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8); }
-void pFiiipL(x64emu_t *emu, uintptr_t fcn) { pFiiipL_t fn = (pFiiipL_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (uintptr_t)R_R8); }
 void pFipipL(x64emu_t *emu, uintptr_t fcn) { pFipipL_t fn = (pFipipL_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (uintptr_t)R_R8); }
 void pFipipp(x64emu_t *emu, uintptr_t fcn) { pFipipp_t fn = (pFipipp_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void pFuiiiu(x64emu_t *emu, uintptr_t fcn) { pFuiiiu_t fn = (pFuiiiu_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (uint32_t)R_R8); }
@@ -5198,6 +5195,7 @@ void vFpddddp(x64emu_t *emu, uintptr_t fcn) { vFpddddp_t fn = (vFpddddp_t)fcn; f
 void vFpLLLLu(x64emu_t *emu, uintptr_t fcn) { vFpLLLLu_t fn = (vFpLLLLu_t)fcn; fn((void*)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX, (uintptr_t)R_RCX, (uintptr_t)R_R8, (uint32_t)R_R9); }
 void vFpLpLLL(x64emu_t *emu, uintptr_t fcn) { vFpLpLLL_t fn = (vFpLpLLL_t)fcn; fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (uintptr_t)R_R8, (uintptr_t)R_R9); }
 void vFppiiii(x64emu_t *emu, uintptr_t fcn) { vFppiiii_t fn = (vFppiiii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9); }
+void vFppiiiu(x64emu_t *emu, uintptr_t fcn) { vFppiiiu_t fn = (vFppiiiu_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (uint32_t)R_R9); }
 void vFppiiip(x64emu_t *emu, uintptr_t fcn) { vFppiiip_t fn = (vFppiiip_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (void*)R_R9); }
 void vFppiiuu(x64emu_t *emu, uintptr_t fcn) { vFppiiuu_t fn = (vFppiiuu_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9); }
 void vFppiipi(x64emu_t *emu, uintptr_t fcn) { vFppiipi_t fn = (vFppiipi_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (int32_t)R_R9); }
@@ -5577,6 +5575,7 @@ void vFpuuuuuu(x64emu_t *emu, uintptr_t fcn) { vFpuuuuuu_t fn = (vFpuuuuuu_t)fcn
 void vFpuuUUuu(x64emu_t *emu, uintptr_t fcn) { vFpuuUUuu_t fn = (vFpuuUUuu_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint64_t)R_RCX, (uint64_t)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 8)); }
 void vFpuupupu(x64emu_t *emu, uintptr_t fcn) { vFpuupupu_t fn = (vFpuupupu_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (uint32_t)R_R8, (void*)R_R9, *(uint32_t*)(R_RSP + 8)); }
 void vFpuupppp(x64emu_t *emu, uintptr_t fcn) { vFpuupppp_t fn = (vFpuupppp_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
+void vFpupiiiu(x64emu_t *emu, uintptr_t fcn) { vFpupiiiu_t fn = (vFpupiiiu_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(uint32_t*)(R_RSP + 8)); }
 void vFpupuuup(x64emu_t *emu, uintptr_t fcn) { vFpupuuup_t fn = (vFpupuuup_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9, *(void**)(R_RSP + 8)); }
 void vFpupppui(x64emu_t *emu, uintptr_t fcn) { vFpupppui_t fn = (vFpupppui_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (uint32_t)R_R9, *(int32_t*)(R_RSP + 8)); }
 void vFpUiUiup(x64emu_t *emu, uintptr_t fcn) { vFpUiUiup_t fn = (vFpUiUiup_t)fcn; fn((void*)R_RDI, (uint64_t)R_RSI, (int32_t)R_RDX, (uint64_t)R_RCX, (int32_t)R_R8, (uint32_t)R_R9, *(void**)(R_RSP + 8)); }
@@ -5598,6 +5597,7 @@ void vFppipipp(x64emu_t *emu, uintptr_t fcn) { vFppipipp_t fn = (vFppipipp_t)fcn
 void vFppipppp(x64emu_t *emu, uintptr_t fcn) { vFppipppp_t fn = (vFppipppp_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void vFppCuupp(x64emu_t *emu, uintptr_t fcn) { vFppCuupp_t fn = (vFppCuupp_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint8_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void vFppuiiip(x64emu_t *emu, uintptr_t fcn) { vFppuiiip_t fn = (vFppuiiip_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(void**)(R_RSP + 8)); }
+void vFppuuuii(x64emu_t *emu, uintptr_t fcn) { vFppuuuii_t fn = (vFppuuuii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8)); }
 void vFppuupii(x64emu_t *emu, uintptr_t fcn) { vFppuupii_t fn = (vFppuupii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8)); }
 void vFppupipp(x64emu_t *emu, uintptr_t fcn) { vFppupipp_t fn = (vFppupipp_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (int32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void vFppUuupp(x64emu_t *emu, uintptr_t fcn) { vFppUuupp_t fn = (vFppUuupp_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint64_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
@@ -5723,6 +5723,7 @@ void uFpuuuppp(x64emu_t *emu, uintptr_t fcn) { uFpuuuppp_t fn = (uFpuuuppp_t)fcn
 void uFpuupppp(x64emu_t *emu, uintptr_t fcn) { uFpuupppp_t fn = (uFpuupppp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void uFppiuppi(x64emu_t *emu, uintptr_t fcn) { uFppiuppi_t fn = (uFppiuppi_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(int32_t*)(R_RSP + 8)); }
 void uFppiuppp(x64emu_t *emu, uintptr_t fcn) { uFppiuppp_t fn = (uFppiuppp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
+void uFppuiupu(x64emu_t *emu, uintptr_t fcn) { uFppuiupu_t fn = (uFppuiupu_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (uint32_t)R_R8, (void*)R_R9, *(uint32_t*)(R_RSP + 8)); }
 void uFppuuuup(x64emu_t *emu, uintptr_t fcn) { uFppuuuup_t fn = (uFppuuuup_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9, *(void**)(R_RSP + 8)); }
 void uFppppppp(x64emu_t *emu, uintptr_t fcn) { uFppppppp_t fn = (uFppppppp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void uFbCuuuuu(x64emu_t *emu, uintptr_t fcn) { uFbCuuuuu_t fn = (uFbCuuuuu_t)fcn; void *aligned_xcb = align_xcb_connection((void*)R_RDI); R_RAX=(uint32_t)fn(aligned_xcb, (uint8_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 8)); unalign_xcb_connection(aligned_xcb, (void*)R_RDI); }
@@ -6159,7 +6160,6 @@ void vFuddiiddiip(x64emu_t *emu, uintptr_t fcn) { vFuddiiddiip_t fn = (vFuddiidd
 void vFffffffffff(x64emu_t *emu, uintptr_t fcn) { vFffffffffff_t fn = (vFffffffffff_t)fcn; fn(emu->xmm[0].f[0], emu->xmm[1].f[0], emu->xmm[2].f[0], emu->xmm[3].f[0], emu->xmm[4].f[0], emu->xmm[5].f[0], emu->xmm[6].f[0], emu->xmm[7].f[0], *(float*)(R_RSP + 8), *(float*)(R_RSP + 16)); }
 void vFpiuippppip(x64emu_t *emu, uintptr_t fcn) { vFpiuippppip_t fn = (vFpiuippppip_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(void**)(R_RSP + 32)); }
 void vFpuupuuuuuu(x64emu_t *emu, uintptr_t fcn) { vFpuupuuuuuu_t fn = (vFpuupuuuuuu_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 8), *(uint32_t*)(R_RSP + 16), *(uint32_t*)(R_RSP + 24), *(uint32_t*)(R_RSP + 32)); }
-void vFppiiiiipip(x64emu_t *emu, uintptr_t fcn) { vFppiiiiipip_t fn = (vFppiiiiipip_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(void**)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(void**)(R_RSP + 32)); }
 void vFppiiiiupip(x64emu_t *emu, uintptr_t fcn) { vFppiiiiupip_t fn = (vFppiiiiupip_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(uint32_t*)(R_RSP + 8), *(void**)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(void**)(R_RSP + 32)); }
 void vFppuipppiip(x64emu_t *emu, uintptr_t fcn) { vFppuipppiip_t fn = (vFppuipppiip_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(void**)(R_RSP + 32)); }
 void vFppuuuiiiii(x64emu_t *emu, uintptr_t fcn) { vFppuuuiiiii_t fn = (vFppuuuiiiii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(int32_t*)(R_RSP + 32)); }
@@ -6282,7 +6282,6 @@ void vFppiiuuuiupup(x64emu_t *emu, uintptr_t fcn) { vFppiiuuuiupup_t fn = (vFppi
 void vFppiipppiiiii(x64emu_t *emu, uintptr_t fcn) { vFppiipppiiiii_t fn = (vFppiipppiiiii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(int32_t*)(R_RSP + 32), *(int32_t*)(R_RSP + 40), *(int32_t*)(R_RSP + 48)); }
 void vFppuuppuiiiii(x64emu_t *emu, uintptr_t fcn) { vFppuuppuiiiii_t fn = (vFppuuppuiiiii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(uint32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(int32_t*)(R_RSP + 32), *(int32_t*)(R_RSP + 40), *(int32_t*)(R_RSP + 48)); }
 void vFppuupppiiiiu(x64emu_t *emu, uintptr_t fcn) { vFppuupppiiiiu_t fn = (vFppuupppiiiiu_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(int32_t*)(R_RSP + 32), *(int32_t*)(R_RSP + 40), *(uint32_t*)(R_RSP + 48)); }
-void vFpppiiiiiiiii(x64emu_t *emu, uintptr_t fcn) { vFpppiiiiiiiii_t fn = (vFpppiiiiiiiii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(int32_t*)(R_RSP + 32), *(int32_t*)(R_RSP + 40), *(int32_t*)(R_RSP + 48)); }
 void vFpppiiiiiiuii(x64emu_t *emu, uintptr_t fcn) { vFpppiiiiiiuii_t fn = (vFpppiiiiiiuii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(uint32_t*)(R_RSP + 32), *(int32_t*)(R_RSP + 40), *(int32_t*)(R_RSP + 48)); }
 void vFpppppppppppp(x64emu_t *emu, uintptr_t fcn) { vFpppppppppppp_t fn = (vFpppppppppppp_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40), *(void**)(R_RSP + 48)); }
 void iFEpppippppppp(x64emu_t *emu, uintptr_t fcn) { iFEpppippppppp_t fn = (iFEpppippppppp_t)fcn; R_RAX=(int32_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40)); }
@@ -6310,7 +6309,6 @@ void vFuffffffffffff(x64emu_t *emu, uintptr_t fcn) { vFuffffffffffff_t fn = (vFu
 void vFpipppiiiiiiuu(x64emu_t *emu, uintptr_t fcn) { vFpipppiiiiiiuu_t fn = (vFpipppiiiiiiuu_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(int32_t*)(R_RSP + 32), *(int32_t*)(R_RSP + 40), *(uint32_t*)(R_RSP + 48), *(uint32_t*)(R_RSP + 56)); }
 void vFpippppppppppp(x64emu_t *emu, uintptr_t fcn) { vFpippppppppppp_t fn = (vFpippppppppppp_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40), *(void**)(R_RSP + 48), *(void**)(R_RSP + 56)); }
 void vFpuppppppppppp(x64emu_t *emu, uintptr_t fcn) { vFpuppppppppppp_t fn = (vFpuppppppppppp_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40), *(void**)(R_RSP + 48), *(void**)(R_RSP + 56)); }
-void vFppiiiiiiiiiii(x64emu_t *emu, uintptr_t fcn) { vFppiiiiiiiiiii_t fn = (vFppiiiiiiiiiii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(int32_t*)(R_RSP + 32), *(int32_t*)(R_RSP + 40), *(int32_t*)(R_RSP + 48), *(int32_t*)(R_RSP + 56)); }
 void vFppiiiiiiuiuii(x64emu_t *emu, uintptr_t fcn) { vFppiiiiiiuiuii_t fn = (vFppiiiiiiuiuii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(uint32_t*)(R_RSP + 24), *(int32_t*)(R_RSP + 32), *(uint32_t*)(R_RSP + 40), *(int32_t*)(R_RSP + 48), *(int32_t*)(R_RSP + 56)); }
 void vFppuuppiiiiuii(x64emu_t *emu, uintptr_t fcn) { vFppuuppiiiiuii_t fn = (vFppuuppiiiiuii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(int32_t*)(R_RSP + 32), *(uint32_t*)(R_RSP + 40), *(int32_t*)(R_RSP + 48), *(int32_t*)(R_RSP + 56)); }
 void vFppuupppuiiiii(x64emu_t *emu, uintptr_t fcn) { vFppuupppuiiiii_t fn = (vFppuupppuiiiii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(uint32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(int32_t*)(R_RSP + 32), *(int32_t*)(R_RSP + 40), *(int32_t*)(R_RSP + 48), *(int32_t*)(R_RSP + 56)); }
@@ -7436,7 +7434,6 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFiipi) return 1;
 	if (fun == &pFiIIi) return 1;
 	if (fun == &pFillu) return 1;
-	if (fun == &pFipii) return 1;
 	if (fun == &pFipip) return 1;
 	if (fun == &pFippi) return 1;
 	if (fun == &pFippu) return 1;
@@ -7850,7 +7847,6 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &LFpppii) return 1;
 	if (fun == &LFppppp) return 1;
 	if (fun == &pFiiiii) return 1;
-	if (fun == &pFiiipL) return 1;
 	if (fun == &pFipipL) return 1;
 	if (fun == &pFipipp) return 1;
 	if (fun == &pFuiiiu) return 1;
@@ -8022,6 +8018,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFpLLLLu) return 1;
 	if (fun == &vFpLpLLL) return 1;
 	if (fun == &vFppiiii) return 1;
+	if (fun == &vFppiiiu) return 1;
 	if (fun == &vFppiiip) return 1;
 	if (fun == &vFppiiuu) return 1;
 	if (fun == &vFppiipi) return 1;
diff --git a/src/wrapped/generated/wrapper.h b/src/wrapped/generated/wrapper.h
index 68e91dad..14a0d02d 100644
--- a/src/wrapped/generated/wrapper.h
+++ b/src/wrapped/generated/wrapper.h
@@ -1282,7 +1282,6 @@ void pFiiLp(x64emu_t *emu, uintptr_t fnc);
 void pFiipi(x64emu_t *emu, uintptr_t fnc);
 void pFiIIi(x64emu_t *emu, uintptr_t fnc);
 void pFillu(x64emu_t *emu, uintptr_t fnc);
-void pFipii(x64emu_t *emu, uintptr_t fnc);
 void pFipip(x64emu_t *emu, uintptr_t fnc);
 void pFippi(x64emu_t *emu, uintptr_t fnc);
 void pFippu(x64emu_t *emu, uintptr_t fnc);
@@ -1797,7 +1796,6 @@ void pFEpppp(x64emu_t *emu, uintptr_t fnc);
 void pFEpppV(x64emu_t *emu, uintptr_t fnc);
 void pFEpppA(x64emu_t *emu, uintptr_t fnc);
 void pFiiiii(x64emu_t *emu, uintptr_t fnc);
-void pFiiipL(x64emu_t *emu, uintptr_t fnc);
 void pFipipL(x64emu_t *emu, uintptr_t fnc);
 void pFipipp(x64emu_t *emu, uintptr_t fnc);
 void pFuiiiu(x64emu_t *emu, uintptr_t fnc);
@@ -2006,6 +2004,7 @@ void vFpddddp(x64emu_t *emu, uintptr_t fnc);
 void vFpLLLLu(x64emu_t *emu, uintptr_t fnc);
 void vFpLpLLL(x64emu_t *emu, uintptr_t fnc);
 void vFppiiii(x64emu_t *emu, uintptr_t fnc);
+void vFppiiiu(x64emu_t *emu, uintptr_t fnc);
 void vFppiiip(x64emu_t *emu, uintptr_t fnc);
 void vFppiiuu(x64emu_t *emu, uintptr_t fnc);
 void vFppiipi(x64emu_t *emu, uintptr_t fnc);
@@ -2386,6 +2385,7 @@ void vFpuuuuuu(x64emu_t *emu, uintptr_t fnc);
 void vFpuuUUuu(x64emu_t *emu, uintptr_t fnc);
 void vFpuupupu(x64emu_t *emu, uintptr_t fnc);
 void vFpuupppp(x64emu_t *emu, uintptr_t fnc);
+void vFpupiiiu(x64emu_t *emu, uintptr_t fnc);
 void vFpupuuup(x64emu_t *emu, uintptr_t fnc);
 void vFpupppui(x64emu_t *emu, uintptr_t fnc);
 void vFpUiUiup(x64emu_t *emu, uintptr_t fnc);
@@ -2407,6 +2407,7 @@ void vFppipipp(x64emu_t *emu, uintptr_t fnc);
 void vFppipppp(x64emu_t *emu, uintptr_t fnc);
 void vFppCuupp(x64emu_t *emu, uintptr_t fnc);
 void vFppuiiip(x64emu_t *emu, uintptr_t fnc);
+void vFppuuuii(x64emu_t *emu, uintptr_t fnc);
 void vFppuupii(x64emu_t *emu, uintptr_t fnc);
 void vFppupipp(x64emu_t *emu, uintptr_t fnc);
 void vFppUuupp(x64emu_t *emu, uintptr_t fnc);
@@ -2532,6 +2533,7 @@ void uFpuuuppp(x64emu_t *emu, uintptr_t fnc);
 void uFpuupppp(x64emu_t *emu, uintptr_t fnc);
 void uFppiuppi(x64emu_t *emu, uintptr_t fnc);
 void uFppiuppp(x64emu_t *emu, uintptr_t fnc);
+void uFppuiupu(x64emu_t *emu, uintptr_t fnc);
 void uFppuuuup(x64emu_t *emu, uintptr_t fnc);
 void uFppppppp(x64emu_t *emu, uintptr_t fnc);
 void uFbCuuuuu(x64emu_t *emu, uintptr_t fnc);
@@ -2969,7 +2971,6 @@ void vFuddiiddiip(x64emu_t *emu, uintptr_t fnc);
 void vFffffffffff(x64emu_t *emu, uintptr_t fnc);
 void vFpiuippppip(x64emu_t *emu, uintptr_t fnc);
 void vFpuupuuuuuu(x64emu_t *emu, uintptr_t fnc);
-void vFppiiiiipip(x64emu_t *emu, uintptr_t fnc);
 void vFppiiiiupip(x64emu_t *emu, uintptr_t fnc);
 void vFppuipppiip(x64emu_t *emu, uintptr_t fnc);
 void vFppuuuiiiii(x64emu_t *emu, uintptr_t fnc);
@@ -3092,7 +3093,6 @@ void vFppiiuuuiupup(x64emu_t *emu, uintptr_t fnc);
 void vFppiipppiiiii(x64emu_t *emu, uintptr_t fnc);
 void vFppuuppuiiiii(x64emu_t *emu, uintptr_t fnc);
 void vFppuupppiiiiu(x64emu_t *emu, uintptr_t fnc);
-void vFpppiiiiiiiii(x64emu_t *emu, uintptr_t fnc);
 void vFpppiiiiiiuii(x64emu_t *emu, uintptr_t fnc);
 void vFpppppppppppp(x64emu_t *emu, uintptr_t fnc);
 void iFEpppippppppp(x64emu_t *emu, uintptr_t fnc);
@@ -3120,7 +3120,6 @@ void vFuffffffffffff(x64emu_t *emu, uintptr_t fnc);
 void vFpipppiiiiiiuu(x64emu_t *emu, uintptr_t fnc);
 void vFpippppppppppp(x64emu_t *emu, uintptr_t fnc);
 void vFpuppppppppppp(x64emu_t *emu, uintptr_t fnc);
-void vFppiiiiiiiiiii(x64emu_t *emu, uintptr_t fnc);
 void vFppiiiiiiuiuii(x64emu_t *emu, uintptr_t fnc);
 void vFppuuppiiiiuii(x64emu_t *emu, uintptr_t fnc);
 void vFppuupppuiiiii(x64emu_t *emu, uintptr_t fnc);
diff --git a/src/wrapped/wrappedgdk3.c b/src/wrapped/wrappedgdk3.c
index 29d7626e..3d5e646c 100644
--- a/src/wrapped/wrappedgdk3.c
+++ b/src/wrapped/wrappedgdk3.c
@@ -149,24 +149,6 @@ static void my3_input_function(my_signal_t* sig, int source, int condition)
     RunFunctionFmt(sig->c_handler, "pii", sig->data, source, condition)       ;
 }
 
-EXPORT int my3_gdk_input_add(x64emu_t* emu, int source, int condition, void* f, void* data)
-{
-    if(!f)
-        return my->gdk_input_add_full(source, condition, f, data, NULL);
-
-    my_signal_t* sig = new_mysignal(f, data, NULL);
-    return my->gdk_input_add_full(source, condition, my3_input_function, sig, my_signal_delete);
-}
-
-EXPORT int my3_gdk_input_add_full(x64emu_t* emu, int source, int condition, void* f, void* data, void* notify)
-{
-    if(!f)
-        return my->gdk_input_add_full(source, condition, f, data, notify);
-
-    my_signal_t* sig = new_mysignal(f, data, notify);
-    return my->gdk_input_add_full(source, condition, my3_input_function, sig, my_signal_delete);
-}
-
 EXPORT void my3_gdk_init(x64emu_t* emu, void* argc, void* argv)
 {
     my->gdk_init(argc, argv);
diff --git a/src/wrapped/wrappedgdk3_private.h b/src/wrapped/wrappedgdk3_private.h
index 04f4a4dd..eab03da8 100644
--- a/src/wrapped/wrappedgdk3_private.h
+++ b/src/wrapped/wrappedgdk3_private.h
@@ -1,10 +1,10 @@
 #if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
-#error meh!
+#error Meh...
 #endif
 
-//GOM(gdk_add_client_message_filter, vFpBp)
 GO(gdk_add_option_entries_libgtk_only, vFp)
-//GO(gdk_app_launch_context_get_type, 
+GO(gdk_anchor_hints_get_type, LFv)
+GO(gdk_app_launch_context_get_type, LFv)
 GO(gdk_app_launch_context_new, pFv)
 GO(gdk_app_launch_context_set_desktop, vFpi)
 GO(gdk_app_launch_context_set_display, vFpp)
@@ -15,10 +15,18 @@ GO(gdk_app_launch_context_set_timestamp, vFpu)
 GO(gdk_atom_intern, pFpi)
 GO(gdk_atom_intern_static_string, pFp)
 GO(gdk_atom_name, pFp)
-GO(gdk_axis_use_get_type, iFv)
+GO(gdk_axis_flags_get_type, LFv)
+GO(gdk_axis_use_get_type, LFv)
 GO(gdk_beep, vFv)
-GO(gdk_bitmap_create_from_data, pFppii)
-GO(gdk_byte_order_get_type, iFv)
+GO(gdk_broadway_cursor_get_type, LFv)
+GO(gdk_broadway_display_get_type, LFv)
+GO(gdk_broadway_display_hide_keyboard, vFp)
+GO(gdk_broadway_display_show_keyboard, vFp)
+GO(gdk_broadway_get_last_seen_time, uFp)
+GO(gdk_broadway_monitor_get_type, LFv)
+GO(gdk_broadway_visual_get_type, LFv)
+GO(gdk_broadway_window_get_type, LFv)
+GO(gdk_byte_order_get_type, LFv)
 GO(gdk_cairo_create, pFp)
 GO(gdk_cairo_draw_from_gl, vFppiiiiiii)
 GO(gdk_cairo_get_clip_rectangle, iFpp)
@@ -26,87 +34,89 @@ GO(gdk_cairo_get_drawing_context, pFp)
 GO(gdk_cairo_rectangle, vFpp)
 GO(gdk_cairo_region, vFpp)
 GO(gdk_cairo_region_create_from_surface, pFp)
-GO(gdk_cairo_reset_clip, vFpp)
 GO(gdk_cairo_set_source_color, vFpp)
 GO(gdk_cairo_set_source_pixbuf, vFppdd)
-GO(gdk_cairo_set_source_pixmap, vFppdd)
 GO(gdk_cairo_set_source_rgba, vFpp)
 GO(gdk_cairo_set_source_window, vFppdd)
 GO(gdk_cairo_surface_create_from_pixbuf, pFpip)
-//GO(gdk_cap_style_get_type, 
-//GO(gdk_char_height, 
-//GO(gdk_char_measure, 
-//GO(gdk_char_width, 
-//GO(gdk_char_width_wc, 
-GO(gdk_color_alloc, iFpp)
-GO(gdk_color_black, iFpp)
-GO(gdk_color_change, iFpp)
 GO(gdk_color_copy, pFp)
 GO(gdk_color_equal, iFpp)
 GO(gdk_color_free, vFp)
-GO(gdk_color_get_type, iFv)
+GO(gdk_color_get_type, LFv)
 GO(gdk_color_hash, uFp)
-GO(gdk_colormap_alloc_color, iFppii)
-GO(gdk_colormap_alloc_colors, iFppiiip)
-GO(gdk_colormap_change, vFpi)
-GO(gdk_colormap_free_colors, vFppi)
-GO(gdk_colormap_get_screen, pFp)
-GO(gdk_colormap_get_system, pFv)
-GO(gdk_colormap_get_system_size, iFv)
-GO(gdk_colormap_get_type, iFv)
-GO(gdk_colormap_get_visual, pFp)
-GO(gdk_colormap_new, pFpi)
-GO(gdk_colormap_query_color, vFpLp)
-GO(gdk_colormap_ref, pFp)
-GO(gdk_colormap_unref, vFp)
 GO(gdk_color_parse, iFpp)
-GO(gdk_colors_alloc, iFpipipi)
-GO(gdk_colors_free, vFppiL)
-GO(gdk_colors_store, vFppi)
 GO(gdk_color_to_string, pFp)
-GO(gdk_color_white, iFpp)
-GO(gdk_crossing_mode_get_type, iFv)
+GO(gdk_crossing_mode_get_type, LFv)
 GO(gdk_cursor_get_cursor_type, iFp)
 GO(gdk_cursor_get_display, pFp)
 GO(gdk_cursor_get_image, pFp)
-GO(gdk_cursor_get_type, iFv)
+GO(gdk_cursor_get_surface, pFppp)
+GO(gdk_cursor_get_type, LFv)
 GO(gdk_cursor_new, pFi)
 GO(gdk_cursor_new_for_display, pFpi)
 GO(gdk_cursor_new_from_name, pFpp)
 GO(gdk_cursor_new_from_pixbuf, pFppii)
-GO(gdk_cursor_new_from_pixmap, pFppppii)
+GO(gdk_cursor_new_from_surface, pFppdd)
 GO(gdk_cursor_ref, pFp)
-GO(gdk_cursor_type_get_type, iFv)
+GO(gdk_cursor_type_get_type, LFv)
 GO(gdk_cursor_unref, vFp)
 GO(gdk_device_free_history, vFpi)
+GO(gdk_device_get_associated_device, pFp)
+GO(gdk_device_get_axes, uFp)
 GO(gdk_device_get_axis, iFppup)
 GO(gdk_device_get_axis_use, uFpu)
-GO(gdk_device_get_core_pointer, pFv)
+GO(gdk_device_get_axis_value, iFpppp)
+GO(gdk_device_get_device_type, uFp)
+GO(gdk_device_get_display, pFp)
 GO(gdk_device_get_has_cursor, iFp)
 GO(gdk_device_get_history, iFppuupp)
 GO(gdk_device_get_key, iFpupp)
+GO(gdk_device_get_last_event_window, pFp)
 GO(gdk_device_get_mode, uFp)
 GO(gdk_device_get_name, pFp)
 GO(gdk_device_get_n_axes, iFp)
 GO(gdk_device_get_n_keys, iFp)
 GO(gdk_device_get_position, vFpppp)
+GO(gdk_device_get_position_double, vFpppp)
+GO(gdk_device_get_product_id, pFp)
+GO(gdk_device_get_seat, pFp)
 GO(gdk_device_get_source, uFp)
 GO(gdk_device_get_state, vFpppp)
-GO(gdk_device_get_type, iFv)
-GO(gdk_device_set_axis_use, vFpuu)
+GO(gdk_device_get_type, LFv)
+GO(gdk_device_get_vendor_id, pFp)
+GO(gdk_device_get_window_at_position, pFppp)
+GO(gdk_device_get_window_at_position_double, pFppp)
+GO(gdk_device_grab, uFppuiupu)
+GO(gdk_device_grab_info_libgtk_only, iFpppp)
+GO(gdk_device_list_axes, pFp)
+GO(gdk_device_list_slave_devices, pFp)
 GO(gdk_device_manager_get_client_pointer, pFp)
-GO(gdk_device_manager_get_type, lFv)
+GO(gdk_device_manager_get_display, pFp)
+GO(gdk_device_manager_get_type, LFv)
+GO(gdk_device_manager_list_devices, pFpu)
+GO(gdk_device_pad_feature_get_type, LFv)
+GO(gdk_device_pad_get_feature_group, iFpui)
+GO(gdk_device_pad_get_group_n_modes, iFpi)
+GO(gdk_device_pad_get_n_features, iFpu)
+GO(gdk_device_pad_get_n_groups, iFp)
+GO(gdk_device_pad_get_type, LFv)
+GO(gdk_device_set_axis_use, vFpuu)
 GO(gdk_device_set_key, vFpuuu)
 GO(gdk_device_set_mode, iFpu)
-GO(gdk_device_set_source, vFpi)
-GO(gdk_devices_list, pFv)
+GO(gdk_device_tool_get_hardware_id, LFp)
+GO(gdk_device_tool_get_serial, LFp)
+GO(gdk_device_tool_get_tool_type, uFp)
+GO(gdk_device_tool_get_type, LFv)
+GO(gdk_device_tool_type_get_type, LFv)
+GO(gdk_device_type_get_type, LFv)
 GO(gdk_device_ungrab, vFpu)
+GO(gdk_device_warp, vFppii)
 GO(gdk_disable_multidevice, vFv)
-//GOM(gdk_display_add_client_message_filter, vFEpppp)
 GO(gdk_display_beep, vFp)
 GO(gdk_display_close, vFp)
+GO(gdk_display_device_is_grabbed, iFpp)
 GO(gdk_display_flush, vFp)
-GO(gdk_display_get_core_pointer, pFp)
+GO(gdk_display_get_app_launch_context, pFp)
 GO(gdk_display_get_default, pFv)
 GO(gdk_display_get_default_cursor_size, uFp)
 GO(gdk_display_get_default_group, pFp)
@@ -115,25 +125,28 @@ GO(gdk_display_get_default_seat, pFp)
 GO(gdk_display_get_device_manager, pFp)
 GO(gdk_display_get_event, pFp)
 GO(gdk_display_get_maximal_cursor_size, vFppp)
-GO(gdk_display_get_name, pFp)
 GO(gdk_display_get_monitor, pFpi)
-GO(gdk_display_get_monitors, pFp)
+GO(gdk_display_get_monitor_at_point, pFpii)
+GO(gdk_display_get_monitor_at_window, pFpp)
+GO(gdk_display_get_name, pFp)
 GO(gdk_display_get_n_monitors, iFp)
 GO(gdk_display_get_n_screens, iFp)
 GO(gdk_display_get_pointer, vFppppp)
 GO(gdk_display_get_primary_monitor, pFp)
 GO(gdk_display_get_screen, pFpi)
-GO(gdk_display_get_type, iFv)
+GO(gdk_display_get_type, LFv)
 GO(gdk_display_get_window_at_pointer, pFppp)
+GO(gdk_display_has_pending, iFp)
 GO(gdk_display_is_closed, iFp)
 GO(gdk_display_keyboard_ungrab, vFpu)
 GO(gdk_display_list_devices, pFp)
+GO(gdk_display_list_seats, pFp)
 GO(gdk_display_manager_get, pFv)
 GO(gdk_display_manager_get_default_display, pFp)
-GO(gdk_display_manager_get_type, iFv)
+GO(gdk_display_manager_get_type, LFv)
 GO(gdk_display_manager_list_displays, pFp)
+GO(gdk_display_manager_open_display, pFpp)
 GO(gdk_display_manager_set_default_display, vFpp)
-GO(gdk_display_map_keycode, iFpuppp)
 GO(gdk_display_notify_startup_complete, vFpp)
 GO(gdk_display_open, pFp)
 GO(gdk_display_open_default_libgtk_only, pFv)
@@ -144,7 +157,6 @@ GO(gdk_display_put_event, vFpp)
 GO(gdk_display_request_selection_notification, iFpp)
 GO(gdk_display_set_double_click_distance, vFpu)
 GO(gdk_display_set_double_click_time, vFpu)
-//GOM(gdk_display_set_pointer_hooks, pFEpp)     // GdkDisplayPointerHooks needs wrapping
 GO(gdk_display_store_clipboard, vFppupi)
 GO(gdk_display_supports_clipboard_persistence, iFp)
 GO(gdk_display_supports_composite, iFp)
@@ -156,206 +168,142 @@ GO(gdk_display_supports_shapes, iFp)
 GO(gdk_display_sync, vFp)
 GO(gdk_display_warp_pointer, vFppii)
 GO(gdk_drag_abort, vFpu)
-GO(gdk_drag_action_get_type, iFv)
+GO(gdk_drag_action_get_type, LFv)
 GO(gdk_drag_begin, pFpp)
-GO(gdk_drag_context_get_actions, iFp)
+GO(gdk_drag_begin_for_device, pFppp)
+GO(gdk_drag_begin_from_point, pFpppii)
+GO(gdk_drag_cancel_reason_get_type, LFv)
+GO(gdk_drag_context_get_actions, uFp)
 GO(gdk_drag_context_get_dest_window, pFp)
+GO(gdk_drag_context_get_device, pFp)
+GO(gdk_drag_context_get_drag_window, pFp)
 GO(gdk_drag_context_get_protocol, uFp)
 GO(gdk_drag_context_get_selected_action, uFp)
 GO(gdk_drag_context_get_source_window, pFp)
-GO(gdk_drag_context_get_suggested_action, iFp)
-GO(gdk_drag_context_get_type, iFv)
+GO(gdk_drag_context_get_suggested_action, uFp)
+GO(gdk_drag_context_get_type, LFv)
 GO(gdk_drag_context_list_targets, pFp)
-GO(gdk_drag_context_new, pFv)
-GO(gdk_drag_context_ref, vFp)
-GO(gdk_drag_context_unref, vFp)
+GO(gdk_drag_context_manage_dnd, iFppu)
+GO(gdk_drag_context_set_device, vFpp)
+GO(gdk_drag_context_set_hotspot, vFpii)
 GO(gdk_drag_drop, vFpu)
+GO(gdk_drag_drop_done, vFpi)
 GO(gdk_drag_drop_succeeded, iFp)
-GO(gdk_drag_find_window, vFppiipp)
 GO(gdk_drag_find_window_for_screen, vFpppiipp)
-GO(gdk_drag_get_protocol, pFpp)
-GO(gdk_drag_get_protocol_for_display, pFppp)
 GO(gdk_drag_get_selection, pFp)
 GO(gdk_drag_motion, iFppuiiuuu)
-GO(gdk_drag_protocol_get_type, iFv)
+GO(gdk_drag_protocol_get_type, LFv)
 GO(gdk_drag_status, vFpuu)
-GO(gdk_drawable_copy_to_image, pFppiiiiii)
-GO(gdk_drawable_get_clip_region, pFp)
-GO(gdk_drawable_get_colormap, pFp)
-GO(gdk_drawable_get_data, pFpp)
-GO(gdk_drawable_get_depth, iFp)
-GO(gdk_drawable_get_display, pFp)
-GO(gdk_drawable_get_image, pFpiiii)
-GO(gdk_drawable_get_screen, pFp)
-GO(gdk_drawable_get_size, vFppp)
-GO(gdk_drawable_get_type, iFv)
-GO(gdk_drawable_get_visible_region, pFp)
-GO(gdk_drawable_get_visual, pFp)
-GO(gdk_drawable_ref, pFp)
-GO(gdk_drawable_set_colormap, vFpp)
-//GOM(gdk_drawable_set_data, vFEpppB)
-GO(gdk_drawable_unref, vFp)
-GO(gdk_draw_arc, vFppiiiiiii)
-GO(gdk_draw_drawable, vFpppiiiiii)
-GO(gdk_draw_glyphs, vFpppiip)
-GO(gdk_draw_glyphs_transformed, vFppppiip)
-GO(gdk_draw_gray_image, vFppiiiiipi)
-GO(gdk_draw_image, vFpppiiiiii)
-GO(gdk_draw_indexed_image, vFppiiiiipip)
-GO(gdk_draw_layout, vFppiip)
-GO(gdk_draw_layout_line, vFppiip)
-GO(gdk_draw_layout_line_with_colors, vFppiippp)
-GO(gdk_draw_layout_with_colors, vFppiippp)
-GO(gdk_draw_line, vFppiiii)
-GO(gdk_draw_lines, vFpppi)
-GO(gdk_draw_pixbuf, vFpppiiiiiiiii)
-GO(gdk_draw_point, vFppii)
-GO(gdk_draw_points, vFpppi)
-GO(gdk_draw_polygon, vFppipi)
-GO(gdk_draw_rectangle, vFppiiiii)
-GO(gdk_draw_rgb_32_image, vFppiiiiipi)
-GO(gdk_draw_rgb_32_image_dithalign, vFppiiiiipiii)
-GO(gdk_draw_rgb_image, vFppiiiiipi)
-GO(gdk_draw_rgb_image_dithalign, vFppiiiiipiii)
-GO(gdk_draw_segments, vFpppi)
-GO(gdk_draw_string, vFpppiip)
-GO(gdk_draw_text, vFpppiipi)
-GO(gdk_draw_text_wc, vFpppiipi)
-GO(gdk_draw_trapezoids, vFpppi)
+GO(gdk_drawing_context_get_cairo_context, pFp)
+GO(gdk_drawing_context_get_clip, pFp)
+GO(gdk_drawing_context_get_type, LFv)
+GO(gdk_drawing_context_get_window, pFp)
+GO(gdk_drawing_context_is_valid, iFp)
 GO(gdk_drop_finish, vFpiu)
 GO(gdk_drop_reply, vFpiu)
 GO(gdk_error_trap_pop, iFv)
+GO(gdk_error_trap_pop_ignored, vFv)
 GO(gdk_error_trap_push, vFv)
 GO(gdk_event_copy, pFp)
 GO(gdk_event_free, vFp)
 GO(gdk_event_get, pFv)
 GO(gdk_event_get_axis, iFpup)
+GO(gdk_event_get_button, iFpp)
+GO(gdk_event_get_click_count, iFpp)
 GO(gdk_event_get_coords, iFppp)
-GO(gdk_event_get_graphics_expose, pFp)
-GO(gdk_event_get_modifier_state, iFp)
+GO(gdk_event_get_device, pFp)
+GO(gdk_event_get_device_tool, pFp)
+GO(gdk_event_get_event_sequence, pFp)
+GO(gdk_event_get_event_type, iFp)
+GO(gdk_event_get_keycode, iFpp)
+GO(gdk_event_get_keyval, iFpp)
+GO(gdk_event_get_pointer_emulated, iFp)
 GO(gdk_event_get_root_coords, iFppp)
+GO(gdk_event_get_scancode, iFp)
 GO(gdk_event_get_screen, pFp)
-GO(gdk_event_get_state, iFpp)
+GO(gdk_event_get_scroll_deltas, iFppp)
+GO(gdk_event_get_scroll_direction, iFpp)
+GO(gdk_event_get_seat, pFp)
 GO(gdk_event_get_source_device, pFp)
-GO(gdk_event_get_surface, pFp)
+GO(gdk_event_get_state, iFpp)
 GO(gdk_event_get_time, uFp)
-GO(gdk_event_get_type, iFv)
+GO(gdk_event_get_type, LFv)
+GO(gdk_event_get_window, pFp)
 GOM(gdk_event_handler_set, vFEppp)
-GO(gdk_event_mask_get_type, lFv)
+//GO(gdk_event_is_allocated, 
+GO(gdk_event_is_scroll_stop_event, iFp)
+GO(gdk_event_mask_get_type, LFv)
 GO(gdk_event_new, pFi)
 GO(gdk_event_peek, pFv)
 GO(gdk_event_put, vFp)
 GO(gdk_event_request_motions, vFp)
-GO(gdk_event_send_client_message, iFpp)
-GO(gdk_event_send_client_message_for_display, iFppp)
-GO(gdk_event_send_clientmessage_toall, vFp)
+GO(gdk_event_sequence_get_type, LFv)
+GO(gdk_event_set_device, vFpp)
+GO(gdk_event_set_device_tool, vFpp)
 GO(gdk_event_set_screen, vFpp)
+GO(gdk_event_set_source_device, vFpp)
+GO(gdk_events_get_angle, iFppp)
+GO(gdk_events_get_center, iFpppp)
+GO(gdk_events_get_distance, iFppp)
 GO(gdk_events_pending, iFv)
-GO(gdk_event_type_get_type, lFv)
-GO(gdk_exit, vFi)
-//GO(gdk_extension_mode_get_type, 
-//GO(gdk_fill_get_type, 
-//GO(gdk_fill_rule_get_type, 
-//GO(gdk_filter_return_get_type, 
+GO(gdk_event_triggers_context_menu, iFp)
+GO(gdk_event_type_get_type, LFv)
+GO(gdk_filter_return_get_type, LFv)
 GO(gdk_flush, vFv)
-//GO(gdk_font_equal, 
-//GO(gdk_font_from_description, 
-//GO(gdk_font_from_description_for_display, 
-//GO(gdk_font_get_display, 
-GO(gdk_font_get_type, iFv)
-//GO(gdk_font_id, 
-//GO(gdk_font_load, 
-//GO(gdk_font_load_for_display, 
-//GO(gdk_font_ref, 
-//GO(gdk_fontset_load, 
-//GO(gdk_fontset_load_for_display, 
-//GO(gdk_font_type_get_type, 
-//GO(gdk_font_unref, 
-GO(gdk_frame_clock_phase_get_type, lFv)
-GO(gdk_frame_clock_get_type, lFv)
-GO(gdk_frame_timings_get_type, lFv)
-GO(gdk_free_compound_text, vFp)
-GO(gdk_free_text_list, vFp)
-GO(gdk_function_get_type, iFv)
-GO(gdk_gc_copy, vFpp)
-GO(gdk_gc_get_colormap, pFp)
-GO(gdk_gc_get_screen, pFp)
-GO(gdk_gc_get_type, iFv)
-GO(gdk_gc_get_values, vFpp)
-GO(gdk_gc_new, pFp)
-GO(gdk_gc_new_with_values, pFppu)
-GO(gdk_gc_offset, vFpii)
-GO(gdk_gc_ref, pFp)
-GO(gdk_gc_set_background, vFpp)
-GO(gdk_gc_set_clip_mask, vFpp)
-GO(gdk_gc_set_clip_origin, vFpii)
-GO(gdk_gc_set_clip_rectangle, vFpp)
-GO(gdk_gc_set_clip_region, vFpp)
-GO(gdk_gc_set_colormap, vFpp)
-GO(gdk_gc_set_dashes, vFpipi)
-GO(gdk_gc_set_exposures, vFpi)
-GO(gdk_gc_set_fill, vFpi)
-GO(gdk_gc_set_font, vFpp)
-GO(gdk_gc_set_foreground, vFpp)
-GO(gdk_gc_set_function,vFpi) 
-GO(gdk_gc_set_line_attributes, vFpiiii)
-GO(gdk_gc_set_rgb_bg_color, vFpp)
-GO(gdk_gc_set_rgb_fg_color, vFpp)
-GO(gdk_gc_set_stipple, vFpp)
-GO(gdk_gc_set_subwindow, vFpi)
-GO(gdk_gc_set_tile, vFpp)
-GO(gdk_gc_set_ts_origin, vFpii)
-GO(gdk_gc_set_values, vFppu)
-GO(gdk_gc_unref, vFp)
-GO(gdk_gc_values_mask_get_type, iFv)
+GO(gdk_frame_clock_begin_updating, vFp)
+GO(gdk_frame_clock_end_updating, vFp)
+GO(gdk_frame_clock_get_current_timings, pFp)
+GO(gdk_frame_clock_get_frame_counter, lFp)
+GO(gdk_frame_clock_get_frame_time, lFp)
+GO(gdk_frame_clock_get_history_start, lFp)
+GO(gdk_frame_clock_get_refresh_info, vFplpp)
+GO(gdk_frame_clock_get_timings, pFpl)
+GO(gdk_frame_clock_get_type, LFv)
+GO(gdk_frame_clock_phase_get_type, LFv)
+GO(gdk_frame_clock_request_phase, vFpu)
+GO(gdk_frame_timings_get_complete, iFp)
+GO(gdk_frame_timings_get_frame_counter, lFp)
+GO(gdk_frame_timings_get_frame_time, lFp)
+GO(gdk_frame_timings_get_predicted_presentation_time, lFp)
+GO(gdk_frame_timings_get_presentation_time, lFp)
+GO(gdk_frame_timings_get_refresh_interval, lFp)
+GO(gdk_frame_timings_get_type, LFv)
+GO(gdk_frame_timings_ref, pFp)
+GO(gdk_frame_timings_unref, vFp)
+GO(gdk_fullscreen_mode_get_type, LFv)
 GO(gdk_get_default_root_window, pFv)
 GO(gdk_get_display, pFv)
 GO(gdk_get_display_arg_name, pFv)
 GO(gdk_get_program_class, pFv)
 GO(gdk_get_show_events, iFv)
-GO(gdk_get_use_xshm, iFv)
-GO(gdk_gl_context_get_type, LFv)
 GO(gdk_gl_context_clear_current, vFv)
 GO(gdk_gl_context_get_current, pFv)
+GO(gdk_gl_context_get_debug_enabled, iFp)
+GO(gdk_gl_context_get_display, pFp)
+GO(gdk_gl_context_get_forward_compatible, iFp)
+GO(gdk_gl_context_get_required_version, vFppp)
+GO(gdk_gl_context_get_shared_context, pFp)
+GO(gdk_gl_context_get_type, LFv)
+GO(gdk_gl_context_get_use_es, iFp)
+GO(gdk_gl_context_get_version, vFppp)
+GO(gdk_gl_context_get_window, pFp)
+GO(gdk_gl_context_is_legacy, iFp)
 GO(gdk_gl_context_make_current, vFp)
 GO(gdk_gl_context_realize, iFpp)
-GO(gdk_grab_status_get_type, iFv)
-GO(gdk_gravity_get_type, iFv)
-GO(gdk_image_get, pFpiiii)
-GO(gdk_image_get_bits_per_pixel, WFp)
-GO(gdk_image_get_byte_order, iFp)
-GO(gdk_image_get_bytes_per_line, WFp)
-GO(gdk_image_get_bytes_per_pixel, WFp)
-GO(gdk_image_get_colormap, pFp)
-GO(gdk_image_get_depth, WFp)
-GO(gdk_image_get_height, iFp)
-GO(gdk_image_get_image_type, iFp)
-GO(gdk_image_get_pixel, uFpii)
-GO(gdk_image_get_pixels, pFp)
-GO(gdk_image_get_type, iFv)
-GO(gdk_image_get_visual, pFp)
-GO(gdk_image_get_width, iFp)
-GO(gdk_image_new, pFipii)
-GO(gdk_image_new_bitmap, pFppii)
-GO(gdk_image_put_pixel, vFpiiu)
-GO(gdk_image_ref, pFp)
-GO(gdk_image_set_colormap, vFpp)
-GO(gdk_image_type_get_type, iFv)
-GO(gdk_image_unref, vFp)
+GO(gdk_gl_context_set_debug_enabled, vFpi)
+GO(gdk_gl_context_set_forward_compatible, vFpi)
+GO(gdk_gl_context_set_required_version, vFpii)
+GO(gdk_gl_context_set_use_es, vFpi)
+GO(gdk_gl_error_get_type, LFv)
+GO(gdk_gl_error_quark, uFv)
+GO(gdk_grab_ownership_get_type, LFv)
+GO(gdk_grab_status_get_type, LFv)
+GO(gdk_gravity_get_type, LFv)
 GOM(gdk_init, vFEpp)
 GOM(gdk_init_check, iFEpp)
-GOM(gdk_input_add, iFEiipp)
-GOM(gdk_input_add_full, iFEiippp)
-GO(gdk_input_condition_get_type, iFv)
-GO(gdk_input_mode_get_type, iFv)
-GO(gdk_input_remove, vFi)
-GO(gdk_input_set_extension_events, vFpii)
-GO(gdk_input_source_get_type, iFv)
-GO(gdk_join_style_get_type, iFv)
-GO(gdk_key_event_get_keycode, uFp)
-GO(gdk_key_event_get_keyval, uFp)
+GO(gdk_input_mode_get_type, LFv)
+GO(gdk_input_source_get_type, LFv)
 GO(gdk_keyboard_grab, uFpiu)
-//GO(gdk_keyboard_grab_info_libgtk_only, 
 GO(gdk_keyboard_ungrab, vFu)
 GO(gdk_keymap_add_virtual_modifiers, vFpp)
 GO(gdk_keymap_get_caps_lock_state, iFp)
@@ -364,7 +312,11 @@ GO(gdk_keymap_get_direction, uFp)
 GO(gdk_keymap_get_entries_for_keycode, iFpuppp)
 GO(gdk_keymap_get_entries_for_keyval, iFpupp)
 GO(gdk_keymap_get_for_display, pFp)
-GO(gdk_keymap_get_type, iFv)
+GO(gdk_keymap_get_modifier_mask, uFpu)
+GO(gdk_keymap_get_modifier_state, uFp)
+GO(gdk_keymap_get_num_lock_state, iFp)
+GO(gdk_keymap_get_scroll_lock_state, iFp)
+GO(gdk_keymap_get_type, LFv)
 GO(gdk_keymap_have_bidi_layouts, iFp)
 GO(gdk_keymap_lookup_key, uFpp)
 GO(gdk_keymap_map_virtual_modifiers, iFpp)
@@ -377,11 +329,9 @@ GO(gdk_keyval_name, pFu)
 GO(gdk_keyval_to_lower, uFu)
 GO(gdk_keyval_to_unicode, uFu)
 GO(gdk_keyval_to_upper, uFu)
-GO(gdk_line_style_get_type, iFv)
 GO(gdk_list_visuals, pFv)
-//GO(gdk_mbstowcs, 
-GO(gdk_monitor_get_connector, pFp)
-GO(gdk_monitor_get_description, pFp)
+GO(gdk_modifier_intent_get_type, LFv)
+GO(gdk_modifier_type_get_type, LFv)
 GO(gdk_monitor_get_display, pFp)
 GO(gdk_monitor_get_geometry, vFpp)
 GO(gdk_monitor_get_height_mm, iFp)
@@ -390,120 +340,50 @@ GO(gdk_monitor_get_model, pFp)
 GO(gdk_monitor_get_refresh_rate, iFp)
 GO(gdk_monitor_get_scale_factor, iFp)
 GO(gdk_monitor_get_subpixel_layout, uFp)
+GO(gdk_monitor_get_type, LFv)
 GO(gdk_monitor_get_width_mm, iFp)
-GO(gdk_monitor_is_valid, iFp)
-GO(gdk_memory_texture_new, pFiiipL)
-GO(gdk_modifier_type_get_type, iFv)
-GO(gdk_net_wm_supports, iFp)
+GO(gdk_monitor_get_workarea, vFpp)
+GO(gdk_monitor_is_primary, iFp)
 GO(gdk_notify_startup_complete, vFv)
 GO(gdk_notify_startup_complete_with_id, vFp)
-GO(gdk_notify_type_get_type, iFv)
+GO(gdk_notify_type_get_type, LFv)
 GO(gdk_offscreen_window_get_embedder, pFp)
-GO(gdk_offscreen_window_get_pixmap, pFp)
-GO(gdk_offscreen_window_get_type, iFv)
+GO(gdk_offscreen_window_get_surface, pFp)
 GO(gdk_offscreen_window_set_embedder, vFpp)
-GO(gdk_overlap_type_get_type, iFv)
-GO(gdk_owner_change_get_type, iFv)
-GO(gdk_paintable_get_intrinsic_height, iFp)
-GO(gdk_paintable_get_intrinsic_width, iFp)
-GO(gdk_paintable_get_type, pFv)
-GO(gdk_paintable_snapshot, vFppdd)
-GO(gdk_pango_attr_emboss_color_new, pFp)
-GO(gdk_pango_attr_embossed_new, pFi)
-GO(gdk_pango_attr_stipple_new, pFp)
+GO(gdk_owner_change_get_type, LFv)
 GO(gdk_pango_context_get, pFv)
+GO(gdk_pango_context_get_for_display, pFp)
 GO(gdk_pango_context_get_for_screen, pFp)
-GO(gdk_pango_context_set_colormap, vFpp)
 GO(gdk_pango_layout_get_clip_region, pFpiipi)
 GO(gdk_pango_layout_line_get_clip_region, pFpiipi)
-GO(gdk_pango_renderer_get_default, pFp)
-GO(gdk_pango_renderer_get_type, iFv)
-GO(gdk_pango_renderer_new, pFp)
-GO(gdk_pango_renderer_set_drawable, vFpp)
-GO(gdk_pango_renderer_set_gc, vFpp)
-GO(gdk_pango_renderer_set_override_color, vFpip)
-GO(gdk_pango_renderer_set_stipple, vFpip)
 GO(gdk_parse_args, vFpp)
-GO(gdk_pixbuf_get_from_drawable, pFpppiiiiii)
-GO(gdk_pixbuf_get_from_image, pFpppiiiiii)
+GO(gdk_pixbuf_get_from_surface, pFpiiii)
 GO(gdk_pixbuf_get_from_window, pFpiiii)
-GO(gdk_pixbuf_render_pixmap_and_mask, vFpppi)
-GO(gdk_pixbuf_render_pixmap_and_mask_for_colormap, vFppppi)
-GO(gdk_pixbuf_render_threshold_alpha, vFppiiiiiii)
-GO(gdk_pixbuf_render_to_drawable, vFpppiiiiiiiii)
-GO(gdk_pixbuf_render_to_drawable_alpha, vFppiiiiiiiiiii)
-GO(gdk_pixmap_colormap_create_from_xpm, pFppppp)
-GO(gdk_pixmap_colormap_create_from_xpm_d, pFppppp)
-GO(gdk_pixmap_create_from_data, pFppiiipp)
-GO(gdk_pixmap_create_from_xpm, pFpppp)
-GO(gdk_pixmap_create_from_xpm_d, pFpppp)
-GO(gdk_pixmap_foreign_new, pFp)
-GO(gdk_pixmap_foreign_new_for_display, pFpp)
-GO(gdk_pixmap_foreign_new_for_screen, pFppiii)
-GO(gdk_pixmap_get_size, vFppp)
-GO(gdk_pixmap_get_type, iFv)
-GO(gdk_pixmap_impl_x11_get_type, iFv)
-GO(gdk_pixmap_lookup, pFp)
-GO(gdk_pixmap_lookup_for_display, pFpp)
-GO(gdk_pixmap_new, pFpiii)
 GO(gdk_pointer_grab, uFpiuppu)
-//GO(gdk_pointer_grab_info_libgtk_only, 
 GO(gdk_pointer_is_grabbed, iFv)
 GO(gdk_pointer_ungrab, vFu)
-//GO(gdk_pre_parse_libgtk_only, 
+GO(gdk_pre_parse_libgtk_only, vFv)
+//GO(gdk__private__, 
 GO(gdk_property_change, vFpppiupi)
 GO(gdk_property_delete, vFpp)
 GO(gdk_property_get, iFpppLLipppp)
-GO(gdk_property_state_get_type, iFv)
-GO(gdk_prop_mode_get_type, iFv)
+GO(gdk_property_state_get_type, LFv)
+GO(gdk_prop_mode_get_type, LFv)
 GO(gdk_query_depths, vFpp)
 GO(gdk_query_visual_types, vFpp)
-GO(gdk_rectangle_get_type, iFv)
+GO(gdk_rectangle_equal, iFpp)
+GO(gdk_rectangle_get_type, LFv)
 GO(gdk_rectangle_intersect, iFppp)
 GO(gdk_rectangle_union, vFppp)
-GO(gdk_region_copy, pFp)
-GO(gdk_region_destroy, vFpp)
-GO(gdk_region_empty, iFp)
-GO(gdk_region_equal, iFpp)
-GO(gdk_region_get_clipbox, vFpp)
-GO(gdk_region_get_rectangles, vFppp)
-GO(gdk_region_intersect, vFpp)
-GO(gdk_region_new, pFv)
-GO(gdk_region_offset, vFpii)
-GO(gdk_region_point_in, iFpii)
-GO(gdk_region_polygon, pFpii)
-GO(gdk_region_rectangle, pFp)
-GO(gdk_region_rect_equal, iFpp)
-GO(gdk_region_rect_in, iFpp)
-GO(gdk_region_shrink, vFpii)
-//GOM(gdk_region_spans_intersect_foreach, vFppiiBp)
-GO(gdk_region_subtract, vFpp)
-GO(gdk_region_union, vFpp)
-GO(gdk_region_union_with_rect, vFpp)
-GO(gdk_region_xor, vFpp)
+GO(gdk_rgba_copy, pFp)
+GO(gdk_rgba_equal, iFpp)
 GO(gdk_rgba_free, vFp)
 GO(gdk_rgba_get_type, LFv)
+GO(gdk_rgba_hash, uFp)
 GO(gdk_rgba_parse, iFpp)
 GO(gdk_rgba_to_string, pFp)
-GO(gdk_rgb_cmap_free, vFp)
-GO(gdk_rgb_cmap_new, pFpi)
-GO(gdk_rgb_colormap_ditherable, iFp)
-GO(gdk_rgb_ditherable, iFv)
-GO(gdk_rgb_dither_get_type, iFv)
-GO(gdk_rgb_find_color, vFpp)
-GO(gdk_rgb_gc_set_background, vFpu)
-GO(gdk_rgb_gc_set_foreground, vFpu)
-GO(gdk_rgb_get_colormap, pFv)
-GO(gdk_rgb_get_visual, pFv)
-GO(gdk_rgb_init, vFv)
-GO(gdk_rgb_set_install, vFi)
-GO(gdk_rgb_set_min_colors, vFi)
-GO(gdk_rgb_set_verbose, vFi)
-GO(gdk_rgb_xpixel_from_rgb, LFu)
-GO(gdk_screen_broadcast_client_message, vFpp)
 GO(gdk_screen_get_active_window, pFp)
 GO(gdk_screen_get_default, pFv)
-GO(gdk_screen_get_default_colormap, pFp)
 GO(gdk_screen_get_display, pFp)
 GO(gdk_screen_get_font_options, pFp)
 GO(gdk_screen_get_height, iFp)
@@ -513,22 +393,19 @@ GO(gdk_screen_get_monitor_at_window, iFpp)
 GO(gdk_screen_get_monitor_geometry, vFpip)
 GO(gdk_screen_get_monitor_height_mm, iFpi)
 GO(gdk_screen_get_monitor_plug_name, pFpi)
+GO(gdk_screen_get_monitor_scale_factor, iFpi)
 GO(gdk_screen_get_monitor_width_mm, iFpi)
 GO(gdk_screen_get_monitor_workarea, vFpip)
 GO(gdk_screen_get_n_monitors, iFp)
 GO(gdk_screen_get_number, iFp)
 GO(gdk_screen_get_primary_monitor, iFp)
 GO(gdk_screen_get_resolution, dFp)
-GO(gdk_screen_get_rgba_colormap, pFp)
 GO(gdk_screen_get_rgba_visual, pFp)
-GO(gdk_screen_get_rgb_colormap, pFp)
-GO(gdk_screen_get_rgb_visual, pFp)
 GO(gdk_screen_get_root_window, pFp)
 GO(gdk_screen_get_setting, iFppp)
-GO(gdk_screen_get_system_colormap, pFp)
 GO(gdk_screen_get_system_visual, pFp)
 GO(gdk_screen_get_toplevel_windows, pFp)
-GO(gdk_screen_get_type, iFv)
+GO(gdk_screen_get_type, LFv)
 GO(gdk_screen_get_width, iFp)
 GO(gdk_screen_get_width_mm, iFp)
 GO(gdk_screen_get_window_stack, pFp)
@@ -537,13 +414,20 @@ GO(gdk_screen_height_mm, iFv)
 GO(gdk_screen_is_composited, iFp)
 GO(gdk_screen_list_visuals, pFp)
 GO(gdk_screen_make_display_name, pFp)
-GO(gdk_screen_set_default_colormap, vFpp)
 GO(gdk_screen_set_font_options, vFpp)
 GO(gdk_screen_set_resolution, vFpd)
 GO(gdk_screen_width, iFv)
 GO(gdk_screen_width_mm, iFv)
-GO(gdk_scroll_direction_get_type, iFv)
+GO(gdk_scroll_direction_get_type, LFv)
+GO(gdk_seat_capabilities_get_type, LFv)
+GO(gdk_seat_get_capabilities, uFp)
+GO(gdk_seat_get_display, pFp)
 GO(gdk_seat_get_keyboard, pFp)
+GO(gdk_seat_get_pointer, pFp)
+GO(gdk_seat_get_slaves, pFpu)
+GO(gdk_seat_get_type, LFv)
+//GOM(gdk_seat_grab, uFppuipppp)
+GO(gdk_seat_ungrab, vFp)
 GO(gdk_selection_convert, vFpppu)
 GO(gdk_selection_owner_get, pFp)
 GO(gdk_selection_owner_get_for_display, pFpp)
@@ -554,42 +438,17 @@ GO(gdk_selection_send_notify, vFppppu)
 GO(gdk_selection_send_notify_for_display, vFpppppu)
 GO(gdk_set_allowed_backends, vFp)
 GO(gdk_set_double_click_time, vFu)
-GO(gdk_set_locale, pFv)
-//GOM(gdk_set_pointer_hooks, BFEB)
 GO(gdk_set_program_class, vFp)
 GO(gdk_set_show_events, vFi)
-GO(gdk_set_sm_client_id, vFp)
-GO(gdk_setting_action_get_type, iFv)
+GO(gdk_setting_action_get_type, LFv)
 GO(gdk_setting_get, iFpp)
-GO(gdk_set_use_xshm, vFi)
-GO(gdk_spawn_command_line_on_screen, iFppp)
-//GOM(gdk_spawn_on_screen, iFEppppipppp)
-//GOM(gdk_spawn_on_screen_with_pipes, iFEppppippppppp)
-GO(gdk_status_get_type, iFv)
-//GO(gdk_string_extents, 
-//GO(gdk_string_height, 
-//GO(gdk_string_measure, 
-GO(gdk_string_to_compound_text, iFppppp)
-GO(gdk_string_to_compound_text_for_display, iFpppppp)
-//GO(gdk_string_width, 
-//GO(gdk_subwindow_mode_get_type, 
+GO(gdk_status_get_type, LFv)
+GO(gdk_subpixel_layout_get_type, LFv)
 //GO(gdk_synthesize_window_state, 
-//GO(gdk_test_render_sync, 
+GO(gdk_test_render_sync, vFp)
 GO(gdk_test_simulate_button, iFpiiuui)
-//GO(gdk_test_simulate_key, 
-//GO(gdk_text_extents, 
-//GO(gdk_text_extents_wc, 
-//GO(gdk_text_height, 
-//GO(gdk_text_measure, 
-GO(gdk_text_property_to_text_list, iFpipip)
-GO(gdk_text_property_to_text_list_for_display, iFppipip)
-GO(gdk_text_property_to_utf8_list, iFpipip)
+GO(gdk_test_simulate_key, iFpiiuui)
 GO(gdk_text_property_to_utf8_list_for_display, iFppipip)
-//GO(gdk_text_width, 
-//GO(gdk_text_width_wc, 
-GO(gdk_texture_download, vFppL)
-GO(gdk_texture_get_width, uFp)
-GO(gdk_texture_get_height, uFp)
 GOM(gdk_threads_add_idle, uFEpp)
 GOM(gdk_threads_add_idle_full, uFEippp)
 //GOM(gdk_threads_add_timeout, uFEupp)
@@ -600,12 +459,10 @@ GO(gdk_threads_enter, vFv)
 GO(gdk_threads_init, vFv)
 GO(gdk_threads_leave, vFv)
 GOM(gdk_threads_set_lock_functions, vFEpp)
-GO(gdk_toplevel_get_type, pFv)
+GO(gdk_touchpad_gesture_phase_get_type, LFv)
 GO(gdk_unicode_to_keyval, uFu)
-GO(gdk_utf8_to_compound_text, iFppppp)
-GO(gdk_utf8_to_compound_text_for_display, iFpppppp)
 GO(gdk_utf8_to_string_target, pFp)
-GO(gdk_visibility_state_get_type, iFv)
+GO(gdk_visibility_state_get_type, LFv)
 GO(gdk_visual_get_best, pFv)
 GO(gdk_visual_get_best_depth, iFv)
 GO(gdk_visual_get_best_type, uFv)
@@ -623,23 +480,49 @@ GO(gdk_visual_get_screen, pFp)
 GO(gdk_visual_get_system, pFv)
 GO(gdk_visual_get_type, LFv)
 GO(gdk_visual_get_visual_type, uFp)
-GO(gdk_visual_type_get_type, iFv)
-GO(gdk_wayland_toplevel_set_transient_for_exported, iFpp)
+GO(gdk_visual_type_get_type, LFv)
+GO(gdk_wayland_device_get_node_path, pFp)
+GO(gdk_wayland_device_get_type, LFv)
+GO(gdk_wayland_device_get_wl_keyboard, pFp)
+GO(gdk_wayland_device_get_wl_pointer, pFp)
+GO(gdk_wayland_device_get_wl_seat, pFp)
+GO(gdk_wayland_device_pad_set_feedback, vFpuup)
+GO(gdk_wayland_display_get_type, LFv)
+GO(gdk_wayland_display_get_wl_compositor, pFp)
+GO(gdk_wayland_display_get_wl_display, pFp)
+GO(gdk_wayland_display_prefers_ssd, iFp)
+GO(gdk_wayland_display_query_registry, iFpp)
+GO(gdk_wayland_display_set_cursor_theme, vFppi)
+GO(gdk_wayland_display_set_startup_notification_id, vFpp)
+GO(gdk_wayland_gl_context_get_type, LFv)
+GO(gdk_wayland_monitor_get_type, LFv)
+GO(gdk_wayland_monitor_get_wl_output, pFp)
+GO(gdk_wayland_seat_get_wl_seat, pFp)
+//GO(gdk_wayland_selection_add_targets_libgtk_only, 
+//GO(gdk_wayland_selection_clear_targets_libgtk_only, 
+GO(gdk_wayland_window_add_frame_callback_surface, vFpp)
+GO(gdk_wayland_window_announce_csd, vFp)
+GO(gdk_wayland_window_announce_ssd, vFp)
+//GOM(gdk_wayland_window_export_handle, iFpppp)
 GO(gdk_wayland_window_get_type, LFv)
+GO(gdk_wayland_window_get_wl_surface, pFp)
+GO(gdk_wayland_window_remove_frame_callback_surface, vFpp)
+GO(gdk_wayland_window_set_application_id, vFpp)
+GO(gdk_wayland_window_set_dbus_properties_libgtk_only, vFppppppp)
 GO(gdk_wayland_window_set_transient_for_exported, iFpp)
-//GO(gdk_wcstombs, 
+GO(gdk_wayland_window_set_use_custom_surface, vFp)
+GO(gdk_wayland_window_unexport_handle, vFp)
 GOM(gdk_window_add_filter, vFEppp)
 GO(gdk_window_at_pointer, pFpp)
-//GO(gdk_window_attributes_type_get_type, 
+GO(gdk_window_attributes_type_get_type, LFv)
 GO(gdk_window_beep, vFp)
+GO(gdk_window_begin_draw_frame, pFpp)
 GO(gdk_window_begin_move_drag, vFpiiiu)
+GO(gdk_window_begin_move_drag_for_device, vFppiiiu)
 GO(gdk_window_begin_paint_rect, vFpp)
 GO(gdk_window_begin_paint_region, vFpp)
 GO(gdk_window_begin_resize_drag, vFpuiiiu)
-GO(gdk_window_class_get_type, iFv)
-GO(gdk_window_clear, vFp)
-GO(gdk_window_clear_area, vFpiiii)
-GO(gdk_window_clear_area_e, vFpiiii)
+GO(gdk_window_begin_resize_drag_for_device, vFpupiiiu)
 GO(gdk_window_configure_finished, vFp)
 GO(gdk_window_constrain_size, vFpuiipp)
 GO(gdk_window_coords_from_parent, vFpddpp)
@@ -650,62 +533,71 @@ GO(gdk_window_create_similar_surface, pFpuii)
 GO(gdk_window_deiconify, vFp)
 GO(gdk_window_destroy, vFp)
 //GO(gdk_window_destroy_notify, 
-//GO(gdk_window_edge_get_type, 
+GO(gdk_window_edge_get_type, LFv)
 GO(gdk_window_enable_synchronized_configure, vFp)
+GO(gdk_window_end_draw_frame, vFpp)
 GO(gdk_window_end_paint, vFp)
 GO(gdk_window_ensure_native, iFp)
 GO(gdk_window_flush, vFp)
 GO(gdk_window_focus, vFpu)
-GO(gdk_window_foreign_new, pFp)
-GO(gdk_window_foreign_new_for_display, pFpp)
-//GO(gdk_window_freeze_toplevel_updates_libgtk_only, 
+GO(gdk_window_freeze_toplevel_updates_libgtk_only, vFp)
 GO(gdk_window_freeze_updates, vFp)
 GO(gdk_window_fullscreen, vFp)
+GO(gdk_window_fullscreen_on_monitor, vFpi)
 GO(gdk_window_geometry_changed, vFp)
 GO(gdk_window_get_accept_focus, iFp)
 GO(gdk_window_get_background_pattern, pFp)
 GO(gdk_window_get_children, pFp)
+GO(gdk_window_get_children_with_user_data, pFpp)
+GO(gdk_window_get_clip_region, pFp)
 GO(gdk_window_get_composited, iFp)
 GO(gdk_window_get_cursor, pFp)
 GO(gdk_window_get_decorations, iFpp)
-GO(gdk_window_get_deskrelative_origin, iFppp)
+GO(gdk_window_get_device_cursor, pFpp)
+GO(gdk_window_get_device_events, uFpp)
+GO(gdk_window_get_device_position, pFppppp)
+GO(gdk_window_get_device_position_double, pFppppp)
 GO(gdk_window_get_display, pFp)
+GO(gdk_window_get_drag_protocol, uFpp)
 GO(gdk_window_get_effective_parent, pFp)
 GO(gdk_window_get_effective_toplevel, pFp)
+GO(gdk_window_get_event_compression, iFp)
 GO(gdk_window_get_events, uFp)
 GO(gdk_window_get_focus_on_map, iFp)
+GO(gdk_window_get_frame_clock, pFp)
 GO(gdk_window_get_frame_extents, vFpp)
+GO(gdk_window_get_fullscreen_mode, uFp)
 GO(gdk_window_get_geometry, vFppppp)
 GO(gdk_window_get_group, pFp)
 GO(gdk_window_get_height, iFp)
-GO(gdk_window_get_internal_paint_info, vFpppp)
 GO(gdk_window_get_modal_hint, iFp)
 GO(gdk_window_get_origin, iFppp)
 GO(gdk_window_get_parent, pFp)
+GO(gdk_window_get_pass_through, iFp)
 GO(gdk_window_get_pointer, pFpppp)
 GO(gdk_window_get_position, vFppp)
 GO(gdk_window_get_root_coords, vFpiipp)
 GO(gdk_window_get_root_origin, vFppp)
+GO(gdk_window_get_scale_factor, iFp)
 GO(gdk_window_get_screen, pFp)
+GO(gdk_window_get_source_events, uFpu)
 GO(gdk_window_get_state, uFp)
+GO(gdk_window_get_support_multidevice, iFp)
 GO(gdk_window_get_toplevel, pFp)
-GO(gdk_window_get_toplevels, pFp)
-GO(gdk_window_get_type, lFv)
+GO(gdk_window_get_type, LFv)
 GO(gdk_window_get_type_hint, uFp)
 GO(gdk_window_get_update_area, pFp)
 GO(gdk_window_get_user_data, vFpp)
+GO(gdk_window_get_visible_region, pFp)
 GO(gdk_window_get_visual, pFp)
 GO(gdk_window_get_width, iFp)
 GO(gdk_window_get_window_type, uFp)
 GO(gdk_window_has_native, iFp)
 GO(gdk_window_hide, vFp)
-GO(gdk_window_hints_get_type, iFv)
+GO(gdk_window_hints_get_type, LFv)
 GO(gdk_window_iconify, vFp)
-GO(gdk_window_impl_get_type, iFv)
-GO(gdk_window_impl_x11_get_type, iFv)
-GO(gdk_window_input_shape_combine_mask, vFppii)
 GO(gdk_window_input_shape_combine_region, vFppii)
-//GOM(gdk_window_invalidate_maybe_recurse, vFEppBp)
+//GOM(gdk_window_invalidate_maybe_recurse, vFEpppp)
 GO(gdk_window_invalidate_rect, vFppi)
 GO(gdk_window_invalidate_region, vFppi)
 GO(gdk_window_is_destroyed, iFp)
@@ -713,143 +605,164 @@ GO(gdk_window_is_input_only, iFp)
 GO(gdk_window_is_shaped, iFp)
 GO(gdk_window_is_viewable, iFp)
 GO(gdk_window_is_visible, iFp)
-GO(gdk_window_lookup, pFp)
-GO(gdk_window_lookup_for_display, pFpp)
 GO(gdk_window_lower, vFp)
+GO(gdk_window_mark_paint_from_clip, vFpp)
 GO(gdk_window_maximize, vFp)
 GO(gdk_window_merge_child_input_shapes, vFp)
 GO(gdk_window_merge_child_shapes, vFp)
 GO(gdk_window_move, vFpii)
 GO(gdk_window_move_region, vFppii)
 GO(gdk_window_move_resize, vFpiiii)
+GO(gdk_window_move_to_rect, vFppuuuii)
 GO(gdk_window_new, pFppi)
-GO(gdk_window_object_get_type, iFv)
 GO(gdk_window_peek_children, pFp)
 GO(gdk_window_process_all_updates, vFv)
 GO(gdk_window_process_updates, vFpi)
 GO(gdk_window_raise, vFp)
-GO(gdk_window_redirect_to_drawable, vFppiiiiii)
 GO(gdk_window_register_dnd, vFp)
 GOM(gdk_window_remove_filter, vFEppp)
-GO(gdk_window_remove_redirection, vFp)
 GO(gdk_window_reparent, vFppii)
 GO(gdk_window_resize, vFpii)
 GO(gdk_window_restack, vFppi)
 GO(gdk_window_scroll, vFpii)
 GO(gdk_window_set_accept_focus, vFpi)
 GO(gdk_window_set_background, vFpp)
+GO(gdk_window_set_background_pattern, vFpp)
 GO(gdk_window_set_background_rgba, vFpp)
-GO(gdk_window_set_back_pixmap, vFppi)
 GO(gdk_window_set_child_input_shapes, vFp)
 GO(gdk_window_set_child_shapes, vFp)
 GO(gdk_window_set_composited, vFpi)
 GO(gdk_window_set_cursor, vFpp)
 GO(gdk_window_set_debug_updates, vFi)
 GO(gdk_window_set_decorations, vFpu)
+GO(gdk_window_set_device_cursor, vFppp)
+GO(gdk_window_set_device_events, vFppu)
+GO(gdk_window_set_event_compression, vFpi)
 GO(gdk_window_set_events, vFpu)
 GO(gdk_window_set_focus_on_map, vFpi)
+GO(gdk_window_set_fullscreen_mode, vFpu)
 GO(gdk_window_set_functions, vFpu)
 GO(gdk_window_set_geometry_hints, vFppu)
 GO(gdk_window_set_group, vFpp)
-GO(gdk_window_set_hints, vFpiiiiiii)
-GO(gdk_window_set_icon, vFpppp)
 GO(gdk_window_set_icon_list, vFpp)
 GO(gdk_window_set_icon_name, vFpp)
+//GOM(gdk_window_set_invalidate_handler, vFpp)
 GO(gdk_window_set_keep_above, vFpi)
 GO(gdk_window_set_keep_below, vFpi)
-GO(gdk_window_set_modal_hint, iFp)
+GO(gdk_window_set_modal_hint, vFpi)
 GO(gdk_window_set_opacity, vFpd)
+GO(gdk_window_set_opaque_region, vFpp)
 GO(gdk_window_set_override_redirect, vFpi)
+GO(gdk_window_set_pass_through, vFpi)
 GO(gdk_window_set_role, vFpp)
+GO(gdk_window_set_shadow_width, vFpiiii)
 GO(gdk_window_set_skip_pager_hint, vFpi)
 GO(gdk_window_set_skip_taskbar_hint, vFpi)
+GO(gdk_window_set_source_events, vFpuu)
 GO(gdk_window_set_startup_id, vFpp)
 GO(gdk_window_set_static_gravities, iFpi)
+GO(gdk_window_set_support_multidevice, vFpi)
 GO(gdk_window_set_title, vFpp)
 GO(gdk_window_set_transient_for, vFpp)
 GO(gdk_window_set_type_hint, vFpu)
 GO(gdk_window_set_urgency_hint, vFpi)
 GO(gdk_window_set_user_data, vFpp)
-GO(gdk_window_shape_combine_mask, vFppii)
 GO(gdk_window_shape_combine_region, vFppii)
 GO(gdk_window_show, vFp)
 GO(gdk_window_show_unraised, vFp)
-GO(gdk_window_state_get_type, iFv)
+GO(gdk_window_show_window_menu, iFpp)
+GO(gdk_window_state_get_type, LFv)
 GO(gdk_window_stick, vFp)
-//GO(gdk_window_thaw_toplevel_updates_libgtk_only, 
+GO(gdk_window_thaw_toplevel_updates_libgtk_only, vFp)
 GO(gdk_window_thaw_updates, vFp)
-GO(gdk_window_type_get_type, iFv)
-GO(gdk_window_type_hint_get_type, iFv)
+GO(gdk_window_type_get_type, LFv)
+GO(gdk_window_type_hint_get_type, LFv)
 GO(gdk_window_unfullscreen, vFp)
 GO(gdk_window_unmaximize, vFp)
 GO(gdk_window_unstick, vFp)
+GO(gdk_window_window_class_get_type, LFv)
 GO(gdk_window_withdraw, vFp)
-GO(gdk_wm_decoration_get_type, iFv)
-GO(gdk_wm_function_get_type, iFv)
-GO(gdk_x11_atom_to_xatom, pFp)
-GO(gdk_x11_atom_to_xatom_for_display, pFpp)
-GO(gdk_x11_colormap_foreign_new, pFpp)
-GO(gdk_x11_colormap_get_xcolormap, pFp)
-GO(gdk_x11_colormap_get_xdisplay, pFp)
-GO(gdk_x11_cursor_get_xcursor, pFp)
+GO(gdk_wm_decoration_get_type, LFv)
+GO(gdk_wm_function_get_type, LFv)
+GO(gdk_x11_app_launch_context_get_type, LFv)
+GO(gdk_x11_atom_to_xatom, LFp)
+GO(gdk_x11_atom_to_xatom_for_display, LFpp)
+GO(gdk_x11_cursor_get_type, LFv)
+GO(gdk_x11_cursor_get_xcursor, LFp)
 GO(gdk_x11_cursor_get_xdisplay, pFp)
+GO(gdk_x11_device_core_get_type, LFv)
+GO(gdk_x11_device_get_id, iFp)
+GO(gdk_x11_device_manager_core_get_type, LFv)
+GO(gdk_x11_device_manager_lookup, pFpi)
+GO(gdk_x11_device_manager_xi2_get_type, LFv)
+GO(gdk_x11_device_xi2_get_type, LFv)
 GO(gdk_x11_display_broadcast_startup_message, vFppppppppppppp)  //vaarg after 2 p
+GO(gdk_x11_display_error_trap_pop, iFp)
+GO(gdk_x11_display_error_trap_pop_ignored, vFp)
+GO(gdk_x11_display_error_trap_push, vFp)
+GO(gdk_x11_display_get_glx_version, iFppp)
 GO(gdk_x11_display_get_startup_notification_id, pFp)
-GO(gdk_x11_display_get_type, iFv)
+GO(gdk_x11_display_get_type, LFv)
 GO(gdk_x11_display_get_user_time, uFp)
 GO(gdk_x11_display_get_xdisplay, pFp)
-GO(gdk_x11_window_get_type, LFv)
-GO(gdk_x11_window_get_xid, LFp)
 GO(gdk_x11_display_grab, vFp)
+GO(gdk_x11_display_manager_get_type, LFv)
 GO(gdk_x11_display_set_cursor_theme, vFppi)
-//GO(gdk_x11_display_string_to_compound_text, 
-//GO(gdk_x11_display_text_property_to_text_list, 
+GO(gdk_x11_display_set_startup_notification_id, vFpp)
+GO(gdk_x11_display_set_window_scale, vFpi)
+GO(gdk_x11_display_string_to_compound_text, iFpppppp)
+GO(gdk_x11_display_text_property_to_text_list, iFppipip)
 GO(gdk_x11_display_ungrab, vFp)
-//GO(gdk_x11_display_utf8_to_compound_text, 
-GO(gdk_x11_drawable_get_xdisplay, pFp)
-GO(gdk_x11_drawable_get_xid, pFp)
-GO(gdk_x11_font_get_name, pFp)
-GO(gdk_x11_font_get_xdisplay, pFp)
-GO(gdk_x11_font_get_xfont, pFp)
-//GO(gdk_x11_free_compound_text, 
-//GO(gdk_x11_free_text_list, 
-GO(gdk_x11_gc_get_xdisplay, pFp)
-GO(gdk_x11_gc_get_xgc, pFp)
-GO(gdk_x11_get_default_root_xwindow, pFv)
+GO(gdk_x11_display_utf8_to_compound_text, iFpppppp)
+GO(gdk_x11_drag_context_get_type, LFv)
+GO(gdk_x11_free_compound_text, vFp)
+GO(gdk_x11_free_text_list, vFp)
+GO(gdk_x11_get_default_root_xwindow, LFv)
 GO(gdk_x11_get_default_screen, iFv)
 GO(gdk_x11_get_default_xdisplay, pFv)
+GO(gdk_x11_get_parent_relative_pattern, pFv)
 GO(gdk_x11_get_server_time, uFp)
-GO(gdk_x11_get_xatom_by_name, pFp)
-GO(gdk_x11_get_xatom_by_name_for_display, pFpp)
-GO(gdk_x11_get_xatom_name, pFp)
-GO(gdk_x11_get_xatom_name_for_display, pFpp)
+GO(gdk_x11_get_xatom_by_name, LFp)
+GO(gdk_x11_get_xatom_by_name_for_display, LFpp)
+GO(gdk_x11_get_xatom_name, pFL)
+GO(gdk_x11_get_xatom_name_for_display, pFpL)
+GO(gdk_x11_gl_context_get_type, LFv)
 GO(gdk_x11_grab_server, vFv)
-GO(gdk_x11_image_get_xdisplay, pFp)
-GO(gdk_x11_image_get_ximage, pFp)
+GO(gdk_x11_keymap_get_group_for_state, iFpu)
+GO(gdk_x11_keymap_get_type, LFv)
+GO(gdk_x11_keymap_key_is_modifier, iFpu)
 GO(gdk_x11_lookup_xdisplay, pFp)
-GO(gdk_x11_pixmap_get_drawable_impl, pFp)
+GO(gdk_x11_monitor_get_output, LFp)
+GO(gdk_x11_monitor_get_type, LFv)
 GO(gdk_x11_register_standard_event_type, vFpii)
-GO(gdk_x11_screen_get_monitor_output, pFpi)
+GO(gdk_x11_screen_get_current_desktop, uFp)
+GO(gdk_x11_screen_get_monitor_output, LFpi)
+GO(gdk_x11_screen_get_number_of_desktops, uFp)
 GO(gdk_x11_screen_get_screen_number, iFp)
+GO(gdk_x11_screen_get_type, LFv)
 GO(gdk_x11_screen_get_window_manager_name, pFp)
-GO(gdk_x11_screen_get_xscreen, pFp)
-GO(gdk_x11_screen_lookup_visual, pFpp)
+//GOM(gdk_x11_screen_get_xscreen, pFp)
+GO(gdk_x11_screen_lookup_visual, pFpL)
 GO(gdk_x11_screen_supports_net_wm_hint, iFpp)
 GO(gdk_x11_set_sm_client_id, vFp)
-GO(gdk_x11_surface_get_xid, LFp)
 GO(gdk_x11_ungrab_server, vFv)
+GO(gdk_x11_visual_get_type, LFv)
 GO(gdk_x11_visual_get_xvisual, pFp)
-GO(gdk_x11_window_foreign_new_for_display, pFpp)
-GO(gdk_x11_window_get_drawable_impl, pFp)
-GO(gdk_x11_window_lookup_for_display, pFpp)
+GO(gdk_x11_window_foreign_new_for_display, pFpL)
+GO(gdk_x11_window_get_desktop, uFp)
+GO(gdk_x11_window_get_type, LFv)
+GO(gdk_x11_window_get_xid, LFp)
+GO(gdk_x11_window_lookup_for_display, pFpL)
 GO(gdk_x11_window_move_to_current_desktop, vFp)
+GO(gdk_x11_window_move_to_desktop, vFpu)
+GO(gdk_x11_window_set_frame_extents, vFpiiii)
+GO(gdk_x11_window_set_frame_sync_enabled, vFpi)
+GO(gdk_x11_window_set_hide_titlebar_when_maximized, vFpi)
+GO(gdk_x11_window_set_theme_variant, vFpp)
 GO(gdk_x11_window_set_user_time, vFpu)
-GO(gdk_x11_xatom_to_atom, pFp)
-GO(gdk_x11_xatom_to_atom_for_display, pFpp)
-GO(gdkx_colormap_get, pFu)
-GO(gdk_xid_table_lookup, pFp)
-GO(gdk_xid_table_lookup_for_display, pFpp)
-GO(gdkx_visual_get, pFp)
+GO(gdk_x11_window_set_utf8_property, vFppp)
+GO(gdk_x11_xatom_to_atom, pFL)
+GO(gdk_x11_xatom_to_atom_for_display, pFpL)
 
 DATA(gdk_display, 4)        // no hack here...
 DATA(gdk_threads_lock, 4)