alec/erythros
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

System/Core: Use CAlloc2()

Browse source
This commit is contained in:
Alec Murphy 2025-04-21 19:48:33 -04:00
parent 9d774cfc23
commit 1b5635962f
4 changed files with 38 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

46
System/Core/Compositor.HC
View file

@ -8,7 +8,7 @@ U0 @compositor_init_truetype_fonts()
U8* name_ptr; U8* name_ptr;
I32 length; I32 length;
while (de) { while (de) {
info = CAlloc(sizeof(stbtt_fontinfo), adam_task); info = CAlloc2(sizeof(stbtt_fontinfo), adam_task);
if (@stbtt_InitFont(info, FileRead(de->full_name), 0)) { if (@stbtt_InitFont(info, FileRead(de->full_name), 0)) {
MemSet(name_buffer, NULL, 512); MemSet(name_buffer, NULL, 512);
name_ptr = @stbtt_GetFontNameDefault(info, &length); name_ptr = @stbtt_GetFontNameDefault(info, &length);
@ -122,7 +122,7 @@ class @compositor
U0 @compositor_add_window_to_list(Window* win) U0 @compositor_add_window_to_list(Window* win)
{ {
@compositor_windows_list* win_list = Compositor.windows; @compositor_windows_list* win_list = Compositor.windows;
@compositor_windows_list* win_next = CAlloc(sizeof(@compositor_windows_list)); @compositor_windows_list* win_next = CAlloc2(sizeof(@compositor_windows_list));
while (win_list->next) { while (win_list->next) {
win_list = win_list->next; win_list = win_list->next;
} }
@ -134,7 +134,7 @@ U0 @compositor_add_window_to_list(Window* win)
U0 @compositor_add_global_input_event_listener_to_list(Window* win) U0 @compositor_add_global_input_event_listener_to_list(Window* win)
{ {
@compositor_windows_list* win_list = Compositor.global_input_event_listeners; @compositor_windows_list* win_list = Compositor.global_input_event_listeners;
@compositor_windows_list* win_next = CAlloc(sizeof(@compositor_windows_list)); @compositor_windows_list* win_next = CAlloc2(sizeof(@compositor_windows_list));
while (win_list->next) { while (win_list->next) {
win_list = win_list->next; win_list = win_list->next;
} }
@ -164,7 +164,7 @@ U0 @compositor_remove_global_input_event_listener_from_list(Window* win)
U0 @compositor_refresh(Window* win) U0 @compositor_refresh(Window* win)
{ {
IpcMessage* msg = CAlloc(sizeof(IpcMessage)); IpcMessage* msg = CAlloc2(sizeof(IpcMessage));
msg->client = win->client; msg->client = win->client;
msg->type = CPZ_MSG_WIN_REPAINT; msg->type = CPZ_MSG_WIN_REPAINT;
msg->payload = win; msg->payload = win;
@ -223,7 +223,7 @@ U0 @compositor_set_z_index_send_msg(Window* win, I64 index)
{ {
if (!win) if (!win)
return; return;
IpcMessage* msg = CAlloc(sizeof(IpcMessage)); IpcMessage* msg = CAlloc2(sizeof(IpcMessage));
msg->client = win->client; msg->client = win->client;
msg->type = CPZ_MSG_WIN_SET_Z_INDEX; msg->type = CPZ_MSG_WIN_SET_Z_INDEX;
msg->payload = win; msg->payload = win;
@ -290,7 +290,7 @@ U0 @compositor_set_wallpaper_send_msg(Context2D* ctx, U32 mode = CPZ_WALLPAPER_A
{ {
if (!ctx) if (!ctx)
return; return;
IpcMessage* msg = CAlloc(sizeof(IpcMessage)); IpcMessage* msg = CAlloc2(sizeof(IpcMessage));
msg->client = Fs; msg->client = Fs;
msg->type = CPZ_MSG_SET_WALLPAPER; msg->type = CPZ_MSG_SET_WALLPAPER;
msg->payload = ctx; msg->payload = ctx;
@ -320,7 +320,7 @@ U0 @compositor_ipc_queue_process()
System.Log(Fs, "Received message ← CreateWindow (%dx%d at %d, %d)", System.Log(Fs, "Received message ← CreateWindow (%dx%d at %d, %d)",
win->width, win->height, win->x, win->y); win->width, win->height, win->x, win->y);
Free(msg); Free(msg);
msg = CAlloc(sizeof(IpcMessage)); msg = CAlloc2(sizeof(IpcMessage));
msg->client = win->client; msg->client = win->client;
msg->type = CPZ_MSG_WIN_REPAINT; msg->type = CPZ_MSG_WIN_REPAINT;
msg->payload = win; msg->payload = win;
@ -518,7 +518,7 @@ U0 @compositor_set_active_window(Window* win)
win_list = win_list->next; win_list = win_list->next;
} }
if (Compositor.active_win && Compositor.active_win != win) { if (Compositor.active_win && Compositor.active_win != win) {
msg = CAlloc(sizeof(IpcMessage)); msg = CAlloc2(sizeof(IpcMessage));
msg->client = Compositor.active_win->client; msg->client = Compositor.active_win->client;
msg->type = CPZ_MSG_WIN_REPAINT; msg->type = CPZ_MSG_WIN_REPAINT;
msg->payload = Compositor.active_win; msg->payload = Compositor.active_win;
@ -531,7 +531,7 @@ U0 @compositor_set_active_window(Window* win)
} }
System.Log(Fs, "SetActiveWindow (%dx%d at %d, %d)", win->width, win->height, System.Log(Fs, "SetActiveWindow (%dx%d at %d, %d)", win->width, win->height,
win->x, win->y); win->x, win->y);
msg = CAlloc(sizeof(IpcMessage)); msg = CAlloc2(sizeof(IpcMessage));
msg->client = win->client; msg->client = win->client;
msg->type = CPZ_MSG_WIN_REPAINT; msg->type = CPZ_MSG_WIN_REPAINT;
msg->payload = win; msg->payload = win;
@ -583,7 +583,7 @@ U0 @compositor_handle_window_resize()
new_height = Max(Compositor.theme.window.min_height, new_height); new_height = Max(Compositor.theme.window.min_height, new_height);
if (Compositor.active_win->width != new_width || Compositor.active_win->height != new_height && !Compositor.active_win->repainting) { if (Compositor.active_win->width != new_width || Compositor.active_win->height != new_height && !Compositor.active_win->repainting) {
Window* win = Compositor.active_win; Window* win = Compositor.active_win;
IpcMessage* msg = CAlloc(sizeof(IpcMessage)); IpcMessage* msg = CAlloc2(sizeof(IpcMessage));
System.Log(Fs, System.Log(Fs,
"Sent message → WindowResizeTo (%dx%d at %d, %d) to (%dx%d)", "Sent message → WindowResizeTo (%dx%d at %d, %d) to (%dx%d)",
Compositor.active_win->width, Compositor.active_win->height, Compositor.active_win->width, Compositor.active_win->height,
@ -673,7 +673,7 @@ U0 @compositor_handle_window_drag()
new_y = Compositor.active_win->origin.y + (Mouse.y - Compositor.active_win->origin.mouse_y); new_y = Compositor.active_win->origin.y + (Mouse.y - Compositor.active_win->origin.mouse_y);
if (Compositor.active_win->x != new_x || Compositor.active_win->y != new_y) { if (Compositor.active_win->x != new_x || Compositor.active_win->y != new_y) {
Window* win = Compositor.active_win; Window* win = Compositor.active_win;
IpcMessage* msg = CAlloc(sizeof(IpcMessage)); IpcMessage* msg = CAlloc2(sizeof(IpcMessage));
System.Log( System.Log(
Fs, "Sent message → WindowMoveTo (%dx%d at %d, %d) to (%d, %d)", Fs, "Sent message → WindowMoveTo (%dx%d at %d, %d) to (%d, %d)",
Compositor.active_win->width, Compositor.active_win->height, Compositor.active_win->width, Compositor.active_win->height,
@ -729,7 +729,7 @@ U0 @compositor_handle_global_input_events()
@compositor_windows_list* win_list = Compositor.global_input_event_listeners->next; @compositor_windows_list* win_list = Compositor.global_input_event_listeners->next;
while (win_list) { while (win_list) {
msg = CAlloc(sizeof(IpcMessage)); msg = CAlloc2(sizeof(IpcMessage));
System.Log(Fs, "Sent message → WinKeyPress [%08x] to window 0x%08x", key, System.Log(Fs, "Sent message → WinKeyPress [%08x] to window 0x%08x", key,
win_list->window); win_list->window);
msg->client = win_list->window->client; msg->client = win_list->window->client;
@ -767,7 +767,7 @@ U0 @compositor_handle_window_input_events(Window* win)
if (win->focused_widget) { if (win->focused_widget) {
if (win->focused_widget->type == WIDGET_TYPE_INPUT) { if (win->focused_widget->type == WIDGET_TYPE_INPUT) {
if (@widget_input_handle_key(win->focused_widget)) { if (@widget_input_handle_key(win->focused_widget)) {
msg = CAlloc(sizeof(IpcMessage)); msg = CAlloc2(sizeof(IpcMessage));
System.Log(Fs, "Sent message → WinKeyPress"); System.Log(Fs, "Sent message → WinKeyPress");
msg->client = win->client; msg->client = win->client;
msg->type = CPZ_MSG_WIN_KEY_PRESS; msg->type = CPZ_MSG_WIN_KEY_PRESS;
@ -789,7 +789,7 @@ U0 @compositor_handle_window_input_events(Window* win)
} }
if (Mouse.z != Compositor.mouse.delta_z) { if (Mouse.z != Compositor.mouse.delta_z) {
msg = CAlloc(sizeof(IpcMessage)); msg = CAlloc2(sizeof(IpcMessage));
System.Log(Fs, "Sent message → WindowMouseWheel"); System.Log(Fs, "Sent message → WindowMouseWheel");
msg->client = win->client; msg->client = win->client;
msg->type = CPZ_MSG_WIN_MOUSE_WHEEL; msg->type = CPZ_MSG_WIN_MOUSE_WHEEL;
@ -804,7 +804,7 @@ U0 @compositor_handle_window_input_events(Window* win)
if (Mouse.x >= win->x && Mouse.x <= win->x + win->width && Mouse.y >= win->y && Mouse.y <= win->y + win->height && (mouse_x != win->mouse.x || mouse_y != win->mouse.y)) { if (Mouse.x >= win->x && Mouse.x <= win->x + win->width && Mouse.y >= win->y && Mouse.y <= win->y + win->height && (mouse_x != win->mouse.x || mouse_y != win->mouse.y)) {
win->mouse.x = mouse_x; win->mouse.x = mouse_x;
win->mouse.y = mouse_y; win->mouse.y = mouse_y;
msg = CAlloc(sizeof(IpcMessage)); msg = CAlloc2(sizeof(IpcMessage));
System.Log(Fs, "Sent message → WindowMouseAt (%dx%d)", mouse_x, System.Log(Fs, "Sent message → WindowMouseAt (%dx%d)", mouse_x,
mouse_y); mouse_y);
msg->client = win->client; msg->client = win->client;
@ -829,7 +829,7 @@ U0 @compositor_handle_window_input_events(Window* win)
win->mouse.left = mouse_left; win->mouse.left = mouse_left;
win->left_btn_down.x = Mouse.x - win->x; win->left_btn_down.x = Mouse.x - win->x;
win->left_btn_down.y = Mouse.y - win->y; win->left_btn_down.y = Mouse.y - win->y;
msg = CAlloc(sizeof(IpcMessage)); msg = CAlloc2(sizeof(IpcMessage));
msg->client = win->client; msg->client = win->client;
msg->type = type; msg->type = type;
msg->payload = win; msg->payload = win;
@ -851,7 +851,7 @@ U0 @compositor_handle_window_input_events(Window* win)
win->mouse.right = mouse_right; win->mouse.right = mouse_right;
win->right_btn_down.x = Mouse.x - win->x; win->right_btn_down.x = Mouse.x - win->x;
win->right_btn_down.y = Mouse.y - win->y; win->right_btn_down.y = Mouse.y - win->y;
msg = CAlloc(sizeof(IpcMessage)); msg = CAlloc2(sizeof(IpcMessage));
msg->client = win->client; msg->client = win->client;
msg->type = type; msg->type = type;
msg->payload = win; msg->payload = win;
@ -885,8 +885,8 @@ Window* @compositor_create_window(I64 x, I64 y, I64 width, I64 height,
I64 flags = WIN_FLAGS_DEFAULT, I64 flags = WIN_FLAGS_DEFAULT,
U8* title = NULL, Context2D* icon = NULL) U8* title = NULL, Context2D* icon = NULL)
{ {
Window* win = CAlloc(sizeof(Window)); Window* win = CAlloc2(sizeof(Window));
IpcMessage* msg = CAlloc(sizeof(IpcMessage)); IpcMessage* msg = CAlloc2(sizeof(IpcMessage));
win->x = x; win->x = x;
win->y = y; win->y = y;
win->width = width; win->width = width;
@ -896,7 +896,7 @@ Window* @compositor_create_window(I64 x, I64 y, I64 width, I64 height,
win->icon = icon; win->icon = icon;
win->client = Fs; win->client = Fs;
win->signature = WIN_SIGNATURE; win->signature = WIN_SIGNATURE;
win->widget = CAlloc(sizeof(@window_widgets_list)); win->widget = CAlloc2(sizeof(@window_widgets_list));
win->callback.close = &@gui_window_callback_close; win->callback.close = &@gui_window_callback_close;
win->callback.maximize = &@gui_window_callback_maximize; win->callback.maximize = &@gui_window_callback_maximize;
win->callback.minimize = &@gui_window_callback_minimize; win->callback.minimize = &@gui_window_callback_minimize;
@ -918,7 +918,7 @@ Window* @compositor_create_window(I64 x, I64 y, I64 width, I64 height,
U0 @compositor_destroy_window(Window* win) U0 @compositor_destroy_window(Window* win)
{ {
IpcMessage* msg = CAlloc(sizeof(IpcMessage)); IpcMessage* msg = CAlloc2(sizeof(IpcMessage));
msg->client = Fs; msg->client = Fs;
msg->type = CPZ_MSG_WIN_DESTROY; msg->type = CPZ_MSG_WIN_DESTROY;
msg->payload = win; msg->payload = win;
@ -1017,8 +1017,8 @@ U0 @compositor_init()
{ {
Compositor.blend_ctx = NewContext2D(Display.Width(), Display.Height()); Compositor.blend_ctx = NewContext2D(Display.Width(), Display.Height());
Compositor.ctx = NewContext2D(Display.Width(), Display.Height()); Compositor.ctx = NewContext2D(Display.Width(), Display.Height());
Compositor.windows = CAlloc(sizeof(@compositor_windows_list)); Compositor.windows = CAlloc2(sizeof(@compositor_windows_list));
Compositor.global_input_event_listeners = CAlloc(sizeof(@compositor_windows_list)); Compositor.global_input_event_listeners = CAlloc2(sizeof(@compositor_windows_list));
Compositor.bounds.x1 = -Display.Width(); Compositor.bounds.x1 = -Display.Width();
Compositor.bounds.y1 = 33; Compositor.bounds.y1 = 33;
Compositor.bounds.x2 = Display.Width(); Compositor.bounds.x2 = Display.Width();

16
System/Core/Shell.HC
View file

@ -16,7 +16,7 @@ U8** @shell_parse_args(@shell* sh, U8* str,
Bool quoted = FALSE; Bool quoted = FALSE;
I64 _argc = 0; I64 _argc = 0;
U8** _argv = NULL; U8** _argv = NULL;
U8** _tmp = CAlloc(sizeof(U64) * StrLen(str)); U8** _tmp = CAlloc2(sizeof(U64) * StrLen(str));
I64 i = 0; I64 i = 0;
I64 s = 0; I64 s = 0;
I64 len; I64 len;
@ -29,7 +29,7 @@ U8** @shell_parse_args(@shell* sh, U8* str,
if (str[i - 1] == '"') if (str[i - 1] == '"')
len--; len--;
if (len - 1) { if (len - 1) {
_tmp[_argc] = CAlloc(len); _tmp[_argc] = CAlloc2(len);
MemCpy(_tmp[_argc], str + s, len - 1); MemCpy(_tmp[_argc], str + s, len - 1);
_argc++; _argc++;
} }
@ -47,7 +47,7 @@ U8** @shell_parse_args(@shell* sh, U8* str,
i++; i++;
} }
*argc = _argc; *argc = _argc;
_argv = CAlloc(sizeof(U64) * _argc); _argv = CAlloc2(sizeof(U64) * _argc);
MemCpy(_argv, _tmp, sizeof(U64) * _argc); MemCpy(_argv, _tmp, sizeof(U64) * _argc);
Free(_tmp); Free(_tmp);
return _argv; return _argv;
@ -90,7 +90,7 @@ U8* @shell_expand_relative_path(@shell* sh, U8* path)
return StrNew(path); return StrNew(path);
break; break;
default: default:
U8* abs_path = CAlloc(StrLen(path) + StrLen(&sh->cwd) + 4); U8* abs_path = CAlloc2(StrLen(path) + StrLen(&sh->cwd) + 4);
StrPrint(abs_path, "%s/%s", &sh->cwd, path); StrPrint(abs_path, "%s/%s", &sh->cwd, path);
return abs_path; return abs_path;
break; break;
@ -121,7 +121,7 @@ U0 @shell_set_env_var(@shell* sh, U8* key, U8* value)
} }
var = var->next; var = var->next;
} }
@shell_env_var* new = CAlloc(sizeof(@shell_env_var)); @shell_env_var* new = CAlloc2(sizeof(@shell_env_var));
StrCpy(&new->key, key); StrCpy(&new->key, key);
StrCpy(&new->value, value); StrCpy(&new->value, value);
new->prev = var; new->prev = var;
@ -261,17 +261,17 @@ U0 @shell_instance(@shell* sh)
U0 @shell_init(@shell* sh) U0 @shell_init(@shell* sh)
{ {
sh->env = CAlloc(sizeof(@shell_env_var)); sh->env = CAlloc2(sizeof(@shell_env_var));
sh->history.limit = SHELL_HISTORY_LIMIT; sh->history.limit = SHELL_HISTORY_LIMIT;
sh->history.pos = 0; sh->history.pos = 0;
sh->history.entries = CAlloc(sizeof(U64) * SHELL_HISTORY_LIMIT); sh->history.entries = CAlloc2(sizeof(U64) * SHELL_HISTORY_LIMIT);
sh->input = FifoU8New(SHELL_INPUT_FIFO_SIZE); sh->input = FifoU8New(SHELL_INPUT_FIFO_SIZE);
sh->task = Spawn(&@shell_instance, sh); sh->task = Spawn(&@shell_instance, sh);
} }
@shell* @shell_new(Bool headless = FALSE) @shell* @shell_new(Bool headless = FALSE)
{ {
@shell* sh = CAlloc(sizeof(@shell)); @shell* sh = CAlloc2(sizeof(@shell));
if (!headless) if (!headless)
@shell_init(sh); @shell_init(sh);
StrCpy(&sh->cwd, &Compositor.session.home); StrCpy(&sh->cwd, &Compositor.session.home);

8
System/Core/SystemStarter.HC
View file

@ -97,7 +97,7 @@ U0 @systemstarter_play_user_startup_sound()
U8 path[512]; U8 path[512];
StrPrint(&path, "/home/%s/.sounds/startup.wav", StrPrint(&path, "/home/%s/.sounds/startup.wav",
&Compositor.session.user.name); &Compositor.session.user.name);
U8** argv = CAlloc(sizeof(U64) * 2); U8** argv = CAlloc2(sizeof(U64) * 2);
argv[0] = "aplay"; argv[0] = "aplay";
argv[1] = &path; argv[1] = &path;
@shell* sh = @shell_new(TRUE); @shell* sh = @shell_new(TRUE);
@ -111,7 +111,7 @@ U0 @systemstarter_set_user_wallpaper()
U8 path[512]; U8 path[512];
StrPrint(&path, "/home/%s/.wallpaper/wallpaper.png", StrPrint(&path, "/home/%s/.wallpaper/wallpaper.png",
&Compositor.session.user.name); &Compositor.session.user.name);
U8** argv = CAlloc(sizeof(U64) * 2); U8** argv = CAlloc2(sizeof(U64) * 2);
argv[0] = "wpset"; argv[0] = "wpset";
argv[1] = &path; argv[1] = &path;
//@shell_cmd_wpset(NULL, 2, argv); //@shell_cmd_wpset(NULL, 2, argv);
@ -196,8 +196,8 @@ U0 @systemstarter_task()
U0 @systemstarter_create_task(U8* path, U8* name) U0 @systemstarter_create_task(U8* path, U8* name)
{ {
@systemtask* st = CAlloc(sizeof(@systemtask)); @systemtask* st = CAlloc2(sizeof(@systemtask));
IpcMessage* msg = CAlloc(sizeof(IpcMessage)); IpcMessage* msg = CAlloc2(sizeof(IpcMessage));
st->path = StrNew(path); st->path = StrNew(path);
st->name = StrNew(name); st->name = StrNew(name);
msg->client = NULL; msg->client = NULL;

6
System/Core/SystemTray.HC
View file

@ -26,7 +26,7 @@ U0 @systemtray_register_item(I64 addr)
U0 @systemtray_unregister_item(Widget* item) U0 @systemtray_unregister_item(Widget* item)
{ {
IpcMessage* msg = CAlloc(sizeof(IpcMessage)); IpcMessage* msg = CAlloc2(sizeof(IpcMessage));
msg->client = NULL; msg->client = NULL;
msg->type = CPZ_MSG_WIN_WIDGET_DESTROY; msg->type = CPZ_MSG_WIN_WIDGET_DESTROY;
msg->payload = item; msg->payload = item;
@ -87,7 +87,7 @@ U0 @systemtray_task()
Context2DWidget* @systemtray_client_register_item() Context2DWidget* @systemtray_client_register_item()
{ {
Context2DWidget* item = NULL; Context2DWidget* item = NULL;
IpcMessage* msg = CAlloc(sizeof(IpcMessage)); IpcMessage* msg = CAlloc2(sizeof(IpcMessage));
msg->client = NULL; msg->client = NULL;
msg->type = SYSTRAY_MSG_REGISTER; msg->type = SYSTRAY_MSG_REGISTER;
msg->payload = &item; msg->payload = &item;
@ -100,7 +100,7 @@ Context2DWidget* @systemtray_client_register_item()
U0 @systemtray_client_unregister_item(Widget* item) U0 @systemtray_client_unregister_item(Widget* item)
{ {
IpcMessage* msg = CAlloc(sizeof(IpcMessage)); IpcMessage* msg = CAlloc2(sizeof(IpcMessage));
msg->client = NULL; msg->client = NULL;
msg->type = SYSTRAY_MSG_UNREGISTER; msg->type = SYSTRAY_MSG_UNREGISTER;
msg->payload = item; msg->payload = item;