diff --git a/include/Mw/TypeDefs.h b/include/Mw/TypeDefs.h index de97cd9..043215e 100644 --- a/include/Mw/TypeDefs.h +++ b/include/Mw/TypeDefs.h @@ -197,26 +197,26 @@ struct _MwListBoxPacket { }; struct _MwClass { - MwHandlerWithStatus create; - MwHandler destroy; - MwHandler draw; - MwHandler click; - MwHandler parent_resize; - MwHandlerProp prop_change; - MwHandler mouse_move; - MwHandlerMouse mouse_up; - MwHandlerMouse mouse_down; - MwHandlerKey key; - MwHandlerExecute execute; - MwHandler tick; - MwHandler resize; - MwHandler children_update; - MwHandlerChildrenProp children_prop_change; + MwHandlerWithStatus create; + MwHandler destroy; + MwHandler draw; + MwHandler click; + MwHandler parent_resize; + MwHandlerProp prop_change; + MwHandler mouse_move; + MwHandlerMouse mouse_up; + MwHandlerMouse mouse_down; + MwHandlerKey key; + MwHandlerExecute execute; + MwHandler tick; + MwHandler resize; + MwHandler children_update; + MwHandlerChildrenProp children_prop_change; MwHandlerClipboardReceived clipboard_received; - void* reserved1; - void* reserved2; - void* reserved3; - void* reserved4; + void* reserved1; + void* reserved2; + void* reserved3; + void* reserved4; }; #endif diff --git a/src/backend/gdi.c b/src/backend/gdi.c index f027fe0..3308fdc 100644 --- a/src/backend/gdi.c +++ b/src/backend/gdi.c @@ -238,12 +238,12 @@ static MwLL MwLLCreateImpl(MwLL parent, int x, int y, int width, int height) { r->common.type = MwLLBackendGDI; r->gdi.get_clipboard = 1; - r->gdi.force_render = 0; - r->gdi.grabbed = 0; - r->gdi.hWnd = CreateWindow("milsko", "Milsko", parent == NULL ? (WS_OVERLAPPEDWINDOW) : (WS_CHILD | WS_VISIBLE), x == MwDEFAULT ? CW_USEDEFAULT : x, y == MwDEFAULT ? CW_USEDEFAULT : y, width, height, parent == NULL ? NULL : parent->gdi.hWnd, 0, wc.hInstance, NULL); - r->gdi.hInstance = wc.hInstance; - r->gdi.cursor = NULL; - r->gdi.icon = NULL; + r->gdi.force_render = 0; + r->gdi.grabbed = 0; + r->gdi.hWnd = CreateWindow("milsko", "Milsko", parent == NULL ? (WS_OVERLAPPEDWINDOW) : (WS_CHILD | WS_VISIBLE), x == MwDEFAULT ? CW_USEDEFAULT : x, y == MwDEFAULT ? CW_USEDEFAULT : y, width, height, parent == NULL ? NULL : parent->gdi.hWnd, 0, wc.hInstance, NULL); + r->gdi.hInstance = wc.hInstance; + r->gdi.cursor = NULL; + r->gdi.icon = NULL; u->ll = r; u->min_set = 0; @@ -393,9 +393,9 @@ static void MwLLNextEventImpl(MwLL handle) { (void)handle; - if(handle->gdi.get_clipboard){ + if(handle->gdi.get_clipboard) { HGLOBAL hg; - if(OpenClipboard(handle->gdi.hWnd) != 0 && (hg = GetClipboardData(CF_TEXT)) != NULL){ + if(OpenClipboard(handle->gdi.hWnd) != 0 && (hg = GetClipboardData(CF_TEXT)) != NULL) { char* txt = malloc(GlobalSize(hg)); char* clp = GlobalLock(hg); diff --git a/src/core.c b/src/core.c index f44a9f8..94ee54e 100644 --- a/src/core.c +++ b/src/core.c @@ -107,8 +107,8 @@ static void llfocusouthandler(MwLL handle, void* data) { MwDispatchUserHandler(h, MwNfocusOutHandler, data); } -static void llclipboardreceivedhandler(MwLL handle, void* data){ - MwWidget h = (MwWidget)handle->common.user; +static void llclipboardreceivedhandler(MwLL handle, void* data) { + MwWidget h = (MwWidget)handle->common.user; MwDispatch3(h, clipboard_received, data); } @@ -143,18 +143,18 @@ MwWidget MwCreateWidget(MwClass widget_class, const char* name, MwWidget parent, if(parent == NULL) arrput(h->tick_list, h); if(h->lowlevel != NULL) { - h->lowlevel->common.user = h; - h->lowlevel->common.handler->draw = lldrawhandler; - h->lowlevel->common.handler->up = lluphandler; - h->lowlevel->common.handler->down = lldownhandler; - h->lowlevel->common.handler->resize = llresizehandler; - h->lowlevel->common.handler->close = llclosehandler; - h->lowlevel->common.handler->move = llmovehandler; - h->lowlevel->common.handler->key = llkeyhandler; - h->lowlevel->common.handler->key_released = llkeyrelhandler; - h->lowlevel->common.handler->focus_in = llfocusinhandler; - h->lowlevel->common.handler->focus_out = llfocusouthandler; - h->lowlevel->common.handler->clipboard_received = llclipboardreceivedhandler; + h->lowlevel->common.user = h; + h->lowlevel->common.handler->draw = lldrawhandler; + h->lowlevel->common.handler->up = lluphandler; + h->lowlevel->common.handler->down = lldownhandler; + h->lowlevel->common.handler->resize = llresizehandler; + h->lowlevel->common.handler->close = llclosehandler; + h->lowlevel->common.handler->move = llmovehandler; + h->lowlevel->common.handler->key = llkeyhandler; + h->lowlevel->common.handler->key_released = llkeyrelhandler; + h->lowlevel->common.handler->focus_in = llfocusinhandler; + h->lowlevel->common.handler->focus_out = llfocusouthandler; + h->lowlevel->common.handler->clipboard_received = llclipboardreceivedhandler; } if(parent != NULL) arrput(parent->children, h); diff --git a/src/widget/box.c b/src/widget/box.c index c38a377..68f266e 100644 --- a/src/widget/box.c +++ b/src/widget/box.c @@ -114,7 +114,7 @@ MwClassRec MwBoxClassRec = { resize, /* resize */ children_update, /* children_update */ children_prop_change, /* children_prop_change */ - NULL, /* clipboard_received */ + NULL, /* clipboard_received */ NULL, NULL, NULL, diff --git a/src/widget/button.c b/src/widget/button.c index 296a14d..677e309 100644 --- a/src/widget/button.c +++ b/src/widget/button.c @@ -107,7 +107,7 @@ MwClassRec MwButtonClassRec = { NULL, /* resize */ NULL, /* children_update */ NULL, /* children_prop_change */ - NULL, /* clipboard_received */ + NULL, /* clipboard_received */ NULL, NULL, NULL, diff --git a/src/widget/checkbox.c b/src/widget/checkbox.c index 390b656..4926433 100644 --- a/src/widget/checkbox.c +++ b/src/widget/checkbox.c @@ -53,7 +53,7 @@ MwClassRec MwCheckBoxClassRec = { NULL, /* resize */ NULL, /* children_update */ NULL, /* children_prop_change */ - NULL, /* clipboard_received */ + NULL, /* clipboard_received */ NULL, NULL, NULL, diff --git a/src/widget/combobox.c b/src/widget/combobox.c index 0cdd629..20def29 100644 --- a/src/widget/combobox.c +++ b/src/widget/combobox.c @@ -204,7 +204,7 @@ MwClassRec MwComboBoxClassRec = { NULL, /* resize */ NULL, /* children_update */ NULL, /* children_prop_change */ - NULL, /* clipboard_received */ + NULL, /* clipboard_received */ NULL, NULL, NULL, diff --git a/src/widget/entry.c b/src/widget/entry.c index 790586a..f85a191 100644 --- a/src/widget/entry.c +++ b/src/widget/entry.c @@ -144,10 +144,10 @@ static void prop_change(MwWidget handle, const char* prop) { } } -static void clipboard_received(MwWidget handle, const char* data){ +static void clipboard_received(MwWidget handle, const char* data) { MwEntry t = handle->internal; - const char* str = MwGetText(handle, MwNtext); - char* out = malloc(strlen(str) + strlen(data) + 1); + const char* str = MwGetText(handle, MwNtext); + char* out = malloc(strlen(str) + strlen(data) + 1); if(str == NULL) str = ""; @@ -162,22 +162,22 @@ static void clipboard_received(MwWidget handle, const char* data){ } MwClassRec MwEntryClassRec = { - create, /* create */ - destroy, /* destroy */ - draw, /* draw */ - NULL, /* click */ - NULL, /* parent_resize */ - prop_change, /* prop_change */ - NULL, /* mouse_move */ - MwForceRender2, /* mouse_up */ - MwForceRender2, /* mouse_down */ - key, /* key */ - NULL, /* execute */ - NULL, /* tick */ - NULL, /* resize */ - NULL, /* children_update */ - NULL, /* children_prop_change */ - clipboard_received, /* clipboard_received */ + create, /* create */ + destroy, /* destroy */ + draw, /* draw */ + NULL, /* click */ + NULL, /* parent_resize */ + prop_change, /* prop_change */ + NULL, /* mouse_move */ + MwForceRender2, /* mouse_up */ + MwForceRender2, /* mouse_down */ + key, /* key */ + NULL, /* execute */ + NULL, /* tick */ + NULL, /* resize */ + NULL, /* children_update */ + NULL, /* children_prop_change */ + clipboard_received, /* clipboard_received */ NULL, NULL, NULL, diff --git a/src/widget/frame.c b/src/widget/frame.c index 869f604..eb324f0 100644 --- a/src/widget/frame.c +++ b/src/widget/frame.c @@ -61,7 +61,7 @@ MwClassRec MwFrameClassRec = { NULL, /* resize */ NULL, /* children_update */ NULL, /* children_prop_change */ - NULL, /* clipboard_received */ + NULL, /* clipboard_received */ NULL, NULL, NULL, diff --git a/src/widget/image.c b/src/widget/image.c index a9c0c26..07afbab 100644 --- a/src/widget/image.c +++ b/src/widget/image.c @@ -57,7 +57,7 @@ MwClassRec MwImageClassRec = { NULL, /* resize */ NULL, /* children_update */ NULL, /* children_prop_change */ - NULL, /* clipboard_received */ + NULL, /* clipboard_received */ NULL, NULL, NULL, diff --git a/src/widget/label.c b/src/widget/label.c index 570dc10..f53b72e 100644 --- a/src/widget/label.c +++ b/src/widget/label.c @@ -375,7 +375,7 @@ MwClassRec MwLabelClassRec = { NULL, /* resize */ NULL, /* children_update */ NULL, /* children_prop_change */ - NULL, /* clipboard_received */ + NULL, /* clipboard_received */ NULL, NULL, NULL, diff --git a/src/widget/listbox.c b/src/widget/listbox.c index 5c741ff..2fadc5f 100644 --- a/src/widget/listbox.c +++ b/src/widget/listbox.c @@ -608,7 +608,7 @@ MwClassRec MwListBoxClassRec = { NULL, /* resize */ NULL, /* children_update */ NULL, /* children_prop_change */ - NULL, /* clipboard_received */ + NULL, /* clipboard_received */ NULL, NULL, NULL, diff --git a/src/widget/menu.c b/src/widget/menu.c index 6dba8a1..4572d3f 100644 --- a/src/widget/menu.c +++ b/src/widget/menu.c @@ -204,7 +204,7 @@ MwClassRec MwMenuClassRec = { NULL, /* resize */ NULL, /* children_update */ NULL, /* children_prop_change */ - NULL, /* clipboard_received */ + NULL, /* clipboard_received */ NULL, NULL, NULL, diff --git a/src/widget/numberentry.c b/src/widget/numberentry.c index cb8d6a2..83577aa 100644 --- a/src/widget/numberentry.c +++ b/src/widget/numberentry.c @@ -143,7 +143,7 @@ MwClassRec MwNumberEntryClassRec = { NULL, /* resize */ NULL, /* children_update */ NULL, /* children_prop_change */ - NULL, /* clipboard_received */ + NULL, /* clipboard_received */ NULL, NULL, NULL, diff --git a/src/widget/opengl.c b/src/widget/opengl.c index 20b51f2..7413acd 100644 --- a/src/widget/opengl.c +++ b/src/widget/opengl.c @@ -244,7 +244,7 @@ MwClassRec MwOpenGLClassRec = { NULL, /* resize */ NULL, /* children_update */ NULL, /* children_prop_change */ - NULL, /* clipboard_received */ + NULL, /* clipboard_received */ NULL, NULL, NULL, diff --git a/src/widget/progressbar.c b/src/widget/progressbar.c index 7ab3274..c0b44be 100644 --- a/src/widget/progressbar.c +++ b/src/widget/progressbar.c @@ -61,7 +61,7 @@ MwClassRec MwProgressBarClassRec = { NULL, /* resize */ NULL, /* children_update */ NULL, /* children_prop_change */ - NULL, /* clipboard_received */ + NULL, /* clipboard_received */ NULL, NULL, NULL, diff --git a/src/widget/radiobox.c b/src/widget/radiobox.c index 063c09d..d932ba6 100644 --- a/src/widget/radiobox.c +++ b/src/widget/radiobox.c @@ -62,7 +62,7 @@ MwClassRec MwRadioBoxClassRec = { NULL, /* resize */ NULL, /* children_update */ NULL, /* children_prop_change */ - NULL, /* clipboard_received */ + NULL, /* clipboard_received */ NULL, NULL, NULL, diff --git a/src/widget/scrollbar.c b/src/widget/scrollbar.c index eaa87ae..055ea5a 100644 --- a/src/widget/scrollbar.c +++ b/src/widget/scrollbar.c @@ -272,7 +272,7 @@ MwClassRec MwScrollBarClassRec = { NULL, /* resize */ NULL, /* children_update */ NULL, /* children_prop_change */ - NULL, /* clipboard_received */ + NULL, /* clipboard_received */ NULL, NULL, NULL, diff --git a/src/widget/separator.c b/src/widget/separator.c index 424305e..c608dd1 100644 --- a/src/widget/separator.c +++ b/src/widget/separator.c @@ -50,7 +50,7 @@ MwClassRec MwSeparatorClassRec = { NULL, /* resize */ NULL, /* children_update */ NULL, /* children_prop_change */ - NULL, /* clipboard_received */ + NULL, /* clipboard_received */ NULL, NULL, NULL, diff --git a/src/widget/submenu.c b/src/widget/submenu.c index 3b5553e..13b6941 100644 --- a/src/widget/submenu.c +++ b/src/widget/submenu.c @@ -253,7 +253,7 @@ MwClassRec MwSubMenuClassRec = { NULL, /* resize */ NULL, /* children_update */ NULL, /* children_prop_change */ - NULL, /* clipboard_received */ + NULL, /* clipboard_received */ NULL, NULL, NULL, diff --git a/src/widget/treeview.c b/src/widget/treeview.c index 7dad52b..903a129 100644 --- a/src/widget/treeview.c +++ b/src/widget/treeview.c @@ -496,7 +496,7 @@ MwClassRec MwTreeViewClassRec = { NULL, /* resize */ NULL, /* children_update */ NULL, /* children_prop_change */ - NULL, /* clipboard_received */ + NULL, /* clipboard_received */ NULL, NULL, NULL, diff --git a/src/widget/viewport.c b/src/widget/viewport.c index 5b66b6e..3a9e3fd 100644 --- a/src/widget/viewport.c +++ b/src/widget/viewport.c @@ -191,7 +191,7 @@ MwClassRec MwViewportClassRec = { NULL, /* resize */ NULL, /* children_update */ NULL, /* children_prop_change */ - NULL, /* clipboard_received */ + NULL, /* clipboard_received */ NULL, NULL, NULL, diff --git a/src/widget/vulkan.c b/src/widget/vulkan.c index 15039f7..c85ea43 100644 --- a/src/widget/vulkan.c +++ b/src/widget/vulkan.c @@ -524,7 +524,7 @@ MwClassRec MwVulkanClassRec = { NULL, /* resize */ NULL, /* children_update */ NULL, /* children_prop_change */ - NULL, /* clipboard_received */ + NULL, /* clipboard_received */ NULL, NULL, NULL, diff --git a/src/widget/window.c b/src/widget/window.c index 84c7140..4a821de 100644 --- a/src/widget/window.c +++ b/src/widget/window.c @@ -59,7 +59,7 @@ MwClassRec MwWindowClassRec = { NULL, /* resize */ NULL, /* children_update */ NULL, /* children_prop_change */ - NULL, /* clipboard_received */ + NULL, /* clipboard_received */ NULL, NULL, NULL,