diff --git a/cleonos/c/include/cleonos_syscall.h b/cleonos/c/include/cleonos_syscall.h index ded3de7..1ed702d 100644 --- a/cleonos/c/include/cleonos_syscall.h +++ b/cleonos/c/include/cleonos_syscall.h @@ -66,28 +66,28 @@ typedef struct cleonos_mouse_state { #define CLEONOS_WM_FLAG_TOPMOST 0x1ULL -typedef struct cleonos_wm_event { - u64 type; - u64 arg0; - u64 arg1; - u64 arg2; - u64 arg3; -} cleonos_wm_event; - -typedef struct cleonos_wm_snapshot { - u64 window_id; - u64 owner_pid; - u64 flags; - u64 x; - u64 y; - u64 width; - u64 height; - u64 focused; - u64 presented; - u64 event_count; -} cleonos_wm_snapshot; - -typedef struct cleonos_wm_create_req { +typedef struct cleonos_wm_event { + u64 type; + u64 arg0; + u64 arg1; + u64 arg2; + u64 arg3; +} cleonos_wm_event; + +typedef struct cleonos_wm_snapshot { + u64 window_id; + u64 owner_pid; + u64 flags; + u64 x; + u64 y; + u64 width; + u64 height; + u64 focused; + u64 presented; + u64 event_count; +} cleonos_wm_snapshot; + +typedef struct cleonos_wm_create_req { u64 x; u64 y; u64 width; @@ -274,12 +274,12 @@ typedef struct cleonos_net_tcp_recv_req { #define CLEONOS_SYSCALL_WM_POLL_EVENT 111ULL #define CLEONOS_SYSCALL_WM_MOVE 112ULL #define CLEONOS_SYSCALL_WM_SET_FOCUS 113ULL -#define CLEONOS_SYSCALL_WM_SET_FLAGS 114ULL -#define CLEONOS_SYSCALL_WM_RESIZE 115ULL -#define CLEONOS_SYSCALL_PTY_OPEN 116ULL -#define CLEONOS_SYSCALL_WM_COUNT 117ULL -#define CLEONOS_SYSCALL_WM_ID_AT 118ULL -#define CLEONOS_SYSCALL_WM_SNAPSHOT 119ULL +#define CLEONOS_SYSCALL_WM_SET_FLAGS 114ULL +#define CLEONOS_SYSCALL_WM_RESIZE 115ULL +#define CLEONOS_SYSCALL_PTY_OPEN 116ULL +#define CLEONOS_SYSCALL_WM_COUNT 117ULL +#define CLEONOS_SYSCALL_WM_ID_AT 118ULL +#define CLEONOS_SYSCALL_WM_SNAPSHOT 119ULL u64 cleonos_syscall(u64 id, u64 arg0, u64 arg1, u64 arg2); u64 cleonos_sys_log_write(const char *message, u64 length); @@ -395,12 +395,12 @@ u64 cleonos_sys_wm_destroy(u64 window_id); u64 cleonos_sys_wm_present(const cleonos_wm_present_req *req); u64 cleonos_sys_wm_poll_event(u64 window_id, cleonos_wm_event *out_event); u64 cleonos_sys_wm_move(const cleonos_wm_move_req *req); -u64 cleonos_sys_wm_set_focus(u64 window_id); -u64 cleonos_sys_wm_set_flags(u64 window_id, u64 flags); -u64 cleonos_sys_wm_resize(const cleonos_wm_resize_req *req); -u64 cleonos_sys_wm_count(void); -u64 cleonos_sys_wm_id_at(u64 index, u64 *out_window_id); -u64 cleonos_sys_wm_snapshot(u64 window_id, cleonos_wm_snapshot *out_snapshot, u64 out_size); -u64 cleonos_sys_pty_open(void); +u64 cleonos_sys_wm_set_focus(u64 window_id); +u64 cleonos_sys_wm_set_flags(u64 window_id, u64 flags); +u64 cleonos_sys_wm_resize(const cleonos_wm_resize_req *req); +u64 cleonos_sys_wm_count(void); +u64 cleonos_sys_wm_id_at(u64 index, u64 *out_window_id); +u64 cleonos_sys_wm_snapshot(u64 window_id, cleonos_wm_snapshot *out_snapshot, u64 out_size); +u64 cleonos_sys_pty_open(void); #endif diff --git a/cleonos/c/src/syscall.c b/cleonos/c/src/syscall.c index 4318009..a56000a 100644 --- a/cleonos/c/src/syscall.c +++ b/cleonos/c/src/syscall.c @@ -492,22 +492,22 @@ u64 cleonos_sys_wm_set_flags(u64 window_id, u64 flags) { return cleonos_syscall(CLEONOS_SYSCALL_WM_SET_FLAGS, window_id, flags, 0ULL); } -u64 cleonos_sys_wm_resize(const cleonos_wm_resize_req *req) { - return cleonos_syscall(CLEONOS_SYSCALL_WM_RESIZE, (u64)req, 0ULL, 0ULL); -} - -u64 cleonos_sys_wm_count(void) { - return cleonos_syscall(CLEONOS_SYSCALL_WM_COUNT, 0ULL, 0ULL, 0ULL); -} - -u64 cleonos_sys_wm_id_at(u64 index, u64 *out_window_id) { - return cleonos_syscall(CLEONOS_SYSCALL_WM_ID_AT, index, (u64)out_window_id, 0ULL); -} - -u64 cleonos_sys_wm_snapshot(u64 window_id, cleonos_wm_snapshot *out_snapshot, u64 out_size) { - return cleonos_syscall(CLEONOS_SYSCALL_WM_SNAPSHOT, window_id, (u64)out_snapshot, out_size); -} - -u64 cleonos_sys_pty_open(void) { - return cleonos_syscall(CLEONOS_SYSCALL_PTY_OPEN, 0ULL, 0ULL, 0ULL); -} +u64 cleonos_sys_wm_resize(const cleonos_wm_resize_req *req) { + return cleonos_syscall(CLEONOS_SYSCALL_WM_RESIZE, (u64)req, 0ULL, 0ULL); +} + +u64 cleonos_sys_wm_count(void) { + return cleonos_syscall(CLEONOS_SYSCALL_WM_COUNT, 0ULL, 0ULL, 0ULL); +} + +u64 cleonos_sys_wm_id_at(u64 index, u64 *out_window_id) { + return cleonos_syscall(CLEONOS_SYSCALL_WM_ID_AT, index, (u64)out_window_id, 0ULL); +} + +u64 cleonos_sys_wm_snapshot(u64 window_id, cleonos_wm_snapshot *out_snapshot, u64 out_size) { + return cleonos_syscall(CLEONOS_SYSCALL_WM_SNAPSHOT, window_id, (u64)out_snapshot, out_size); +} + +u64 cleonos_sys_pty_open(void) { + return cleonos_syscall(CLEONOS_SYSCALL_PTY_OPEN, 0ULL, 0ULL, 0ULL); +}