From af472c625cc275b02925b2e99421e1771db79466 Mon Sep 17 00:00:00 2001 From: Nishi Date: Sat, 26 Sep 2026 18:36:17 +0900 Subject: [PATCH] ok --- src/backend/cocoa.m | 6 +++--- src/backend/wayland/interfaces.c | 26 +++++++++++++------------- src/backend/wayland/wayland.c | 14 +++++++------- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/backend/cocoa.m b/src/backend/cocoa.m index 06e7c0e2..63beff15 100644 --- a/src/backend/cocoa.m +++ b/src/backend/cocoa.m @@ -64,7 +64,7 @@ static inline NSPoint localPointFlip(NSPoint point, NSView* view) { /* Recursively dispatch a key event to a widget and its children */ static void recursive_dispatch_key(MwLL handle, int* k) { - MwWidget h = (MwWidget)handle->common.intenral; + MwWidget h = (MwWidget)handle->common.internal; MwLLDispatch(handle, key, k); if(h) { int i; @@ -78,7 +78,7 @@ static void recursive_dispatch_key(MwLL handle, int* k) { }; /* Recursively dispatch a key released event to a widget and its children */ static void recursive_dispatch_key_released(MwLL handle, int* k) { - MwWidget h = (MwWidget)handle->common.intenral; + MwWidget h = (MwWidget)handle->common.internal; MwLLDispatch(handle, key_released, k); if(h) { int i; @@ -637,7 +637,7 @@ static void recursive_dispatch_key_released(MwLL handle, int* k) { [topmost_parent->cocoa.real->view setNeedsDisplay:true]; MwLLDispatch(topmost_parent, draw, NULL); - h = (MwWidget)topmost_parent->common.intenral; + h = (MwWidget)topmost_parent->common.internal; if(h) { int i; for(i = 0; i < arrlen(h->children); i++) { diff --git a/src/backend/wayland/interfaces.c b/src/backend/wayland/interfaces.c index 6ad54067..cd6a1b4b 100644 --- a/src/backend/wayland/interfaces.c +++ b/src/backend/wayland/interfaces.c @@ -23,7 +23,7 @@ static MwBool hit_detect(MwLL child, MwLL* _topmost_parent, MwPoint* _point, MwP /* Recursively dispatch a key event to a widget and its children */ static void recursive_dispatch_key(MwLL handle, int* k) { - MwWidget h = (MwWidget)handle->common.intenral; + MwWidget h = (MwWidget)handle->common.internal; MwLLDispatch(handle, key, k); if(h) { int i; @@ -37,7 +37,7 @@ static void recursive_dispatch_key(MwLL handle, int* k) { }; /* Recursively dispatch a key released event to a widget and its children */ static void recursive_dispatch_key_released(MwLL handle, int* k) { - MwWidget h = (MwWidget)handle->common.intenral; + MwWidget h = (MwWidget)handle->common.internal; MwLLDispatch(handle, key_released, k); if(h) { int i; @@ -52,7 +52,7 @@ static void recursive_dispatch_key_released(MwLL handle, int* k) { /* Recursively dispatch a move event to a widget and its children */ static void recursive_dispatch_move(MwLL handle, MwMouse* p) { - MwWidget h = (MwWidget)handle->common.intenral; + MwWidget h = (MwWidget)handle->common.internal; if(h) { int i; for(i = 0; i < arrlen(h->children); i++) { @@ -165,8 +165,8 @@ static void wl_data_device_leave(void* data, static MwBool motion_cursor_change(MwLL self, wl_clipboard_device_context_t* ctx) { if(self->wayland.type == MwLL_WAYLAND_TOPLEVEL && self->wayland.accepts_dnd) { return MwTRUE; - } else if(self->common.intenral) { - MwWidget w = self->common.intenral; + } else if(self->common.internal) { + MwWidget w = self->common.internal; int i, n; for(i = 0; i < arrlen(w->children); i++) { if(w->children[i]->lowlevel->wayland.type == MwLL_WAYLAND_SUBLEVEL) { @@ -190,8 +190,8 @@ static MwBool motion_cursor_change(MwLL self, wl_clipboard_device_context_t* ctx static void clipboard_dispatch(MwLL self, char* buf) { if(self->wayland.type == MwLL_WAYLAND_TOPLEVEL && self->wayland.accepts_dnd) { MwLLDispatch(self, drag_and_drop, buf); - } else if(self->common.intenral) { - MwWidget w = self->common.intenral; + } else if(self->common.internal) { + MwWidget w = self->common.internal; int i, n; for(i = 0; i < arrlen(w->children); i++) { if(w->children[i]->lowlevel->wayland.type == MwLL_WAYLAND_SUBLEVEL) { @@ -722,7 +722,7 @@ static void pointer_motion(void* data, struct wl_pointer* wl_pointer, MwU32 time }; static void recursive_dispatch_mouse_down(MwLL handle, MwMouse* p) { - MwWidget h = (MwWidget)handle->common.intenral; + MwWidget h = (MwWidget)handle->common.internal; MwLLDispatch(handle, down, p); if(h) { int i; @@ -735,7 +735,7 @@ static void recursive_dispatch_mouse_down(MwLL handle, MwMouse* p) { } }; static void recursive_dispatch_mouse_up(MwLL handle, MwMouse* p) { - MwWidget h = (MwWidget)handle->common.intenral; + MwWidget h = (MwWidget)handle->common.internal; MwLLDispatch(handle, up, p); if(h) { int i; @@ -793,8 +793,8 @@ static void mouse_dispatch(MwLL self, MwMouse p, MwU32 state) { break; } - if(self->common.intenral) { - MwWidget w = self->common.intenral; + if(self->common.internal) { + MwWidget w = self->common.internal; int i, n; for(i = 0; i < arrlen(w->children); i++) { if(w->children[i]->lowlevel->wayland.type == MwLL_WAYLAND_SUBLEVEL) { @@ -963,8 +963,8 @@ static void keyboard_leave(void* data, }; void MwLLRecursiveKeyDispatch(MwLL self, int* k, MwBool down) { - if(self->common.intenral) { - MwWidget w = self->common.intenral; + if(self->common.internal) { + MwWidget w = self->common.internal; int i, n; for(i = 0; i < arrlen(w->children); i++) { if(w->children[i]->lowlevel->wayland.type == MwLL_WAYLAND_SUBLEVEL) { diff --git a/src/backend/wayland/wayland.c b/src/backend/wayland/wayland.c index b3dbcac2..e2e96378 100644 --- a/src/backend/wayland/wayland.c +++ b/src/backend/wayland/wayland.c @@ -14,8 +14,8 @@ MwBool MwWaylandVulkan = MwFALSE; MwBool MwWaylandCairoOnly = MwFALSE; void MwLLWaylandChildrenIterate(MwLL handle, void (*func)(MwLL handle, MwLL child)) { - if(handle->common.intenral) { - MwWidget w = handle->common.intenral; + if(handle->common.internal) { + MwWidget w = handle->common.internal; int i; for(i = 0; i < arrlen(w->children); i++) { if(w->children[i]->lowlevel->wayland.type == MwLL_WAYLAND_SUBLEVEL) { @@ -30,7 +30,7 @@ static int event_loop(MwLL handle); /* Recursively dispatch a resize event to a widget and its children */ static void recursive_dispatch_resize(MwLL handle) { - MwWidget h = (MwWidget)handle->common.intenral; + MwWidget h = (MwWidget)handle->common.internal; if(h) { int i; for(i = 0; i < arrlen(h->children); i++) { @@ -45,7 +45,7 @@ static void recursive_dispatch_resize(MwLL handle) { static void recursive_render(MwLL handle) { int i; - for(i = 0; i < arrlen(((MwWidget)handle->common.intenral)->children); i++) recursive_render(((MwWidget)handle->common.intenral)->children[i]->lowlevel); + for(i = 0; i < arrlen(((MwWidget)handle->common.internal)->children); i++) recursive_render(((MwWidget)handle->common.internal)->children[i]->lowlevel); MwLLForceRender(handle); } @@ -512,7 +512,7 @@ static void setup_popup(MwLL r, int x, int y, MwLL parent) { r->wayland.popup = malloc(sizeof(struct _MwLLWaylandPopup)); if(parent) { - MwWidget p = parent->common.intenral; + MwWidget p = parent->common.internal; while(topmost_parent->wayland.parent) { topmost_parent = topmost_parent->wayland.parent; } @@ -1944,11 +1944,11 @@ static void MwLLRaiseImpl(MwLL handle) { MwLL topmost_parent = handle; int children_num; while(topmost_parent->wayland.parent) topmost_parent = topmost_parent->wayland.parent; - children_num = arrlen(((MwWidget)topmost_parent->common.intenral)->children); + children_num = arrlen(((MwWidget)topmost_parent->common.internal)->children); if(children_num > 1) { printf("%d\n", children_num); - MwWidget last_child = ((MwWidget)topmost_parent->common.intenral)->children[children_num - 1]; + MwWidget last_child = ((MwWidget)topmost_parent->common.internal)->children[children_num - 1]; wl_subsurface_place_above(handle->wayland.sublevel->subsurface, last_child->lowlevel->wayland.framebuffer.surface); } }*/