[INPUT] mouse absolute position syscall

Author: di

kernel/graph/tres.cpp

@@ -7,6 +7,7 @@
 #include "kernel_processes/windows/launcher.h"
 #include "console/kio.h"
 #include "sysregs.h"
+#include "ui/graphic_types.h"
 
 clinkedlist_t *window_list;
 window_frame *focused_window;
@@ -29,6 +30,25 @@ void init_window_manager(uintptr_t gpu_driver){
     main_gpu_driver = (GPUDriver*)gpu_driver;
 }
 
+int find_window(void *node, void *key){
+    if (!node || !key) return -1;
+    window_frame* frame = (window_frame*)node;
+    uint16_t wid = *(uint16_t*)key;
+    if (frame->win_id == wid) return 0;
+    return -1;
+}
+
+gpu_point convert_mouse_position(gpu_point point){
+    process_t *p = get_current_proc();
+    clinkedlist_node_t *node = clinkedlist_find(window_list, PHYS_TO_VIRT_P(&p->win_id), (typeof(find_window)*)PHYS_TO_VIRT_P(find_window));
+    if (node && node->data){
+        window_frame* frame = (window_frame*)node->data;
+        if (point.x > frame->x && point.x < frame->x + frame->width && point.y > frame->y && point.y < frame->y + frame->height)
+            return (gpu_point){ point.x-frame->x, point.y-frame->y};
+    }
+    return (gpu_point){};
+}
+
 extern "C" void create_window(uint32_t x, uint32_t y, uint32_t width, uint32_t height){
     if (win_ids == UINT16_MAX) return;
     window_frame *frame = (window_frame*)malloc(sizeof(window_frame));
@@ -45,14 +65,6 @@ extern "C" void create_window(uint32_t x, uint32_t y, uint32_t width, uint32_t h
     dirty_windows = true;
 }
 
-int find_window(void *node, void *key){
-    if (!node || !key) return -1;
-    window_frame* frame = (window_frame*)node;
-    uint16_t wid = *(uint16_t*)key;
-    if (frame->win_id == wid) return 0;
-    return -1;
-}
-
 void resize_window(uint32_t width, uint32_t height){
     process_t *p = get_current_proc();
     clinkedlist_node_t *node = clinkedlist_find(window_list, PHYS_TO_VIRT_P(&p->win_id), (typeof(find_window)*)PHYS_TO_VIRT_P(find_window));

kernel/graph/tres.h

@@ -29,6 +29,8 @@ void commit_frame(draw_ctx* frame_ctx, window_frame* frame);
 void set_window_focus(uint16_t win_id);
 void unset_window_focus();
 
+gpu_point convert_mouse_position(gpu_point p);
+
 extern clinkedlist_t *window_list;
 
 extern uint16_t win_ids;

kernel/kernel_processes/windows/dos.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "process/process.h"
+#include "ui/graphic_types.h"
 
 #ifdef __cplusplus
 extern "C" {

kernel/process/kernel_syscall_impl.c

@@ -35,8 +35,9 @@ extern bool read_event(kbd_event *event){
     return sys_read_event_current(event);
 }
 
-extern void get_mouse_status(mouse_input *in){
-    *in = get_raw_mouse_in();
+extern void get_mouse_status(mouse_data *in){
+    in->raw = get_raw_mouse_in();
+    in->position = convert_mouse_position(get_mouse_pos());
 }
 
 extern uint16_t exec(const char* prog_name, int argc, const char* argv[]){

kernel/process/syscall.c

@@ -3,6 +3,8 @@
 #include "exceptions/exception_handler.h"
 #include "console/serial/uart.h"
 #include "exceptions/irq.h"
+#include "mouse_input.h"
+#include "process/process.h"
 #include "process/scheduler.h"
 #include "memory/page_allocator.h"
 #include "graph/graphics.h"
@@ -23,6 +25,7 @@
 #include "networking/transport_layer/csocket.h"
 #include "loading/dwarf.h"
 #include "sysregs.h"
+#include "ui/graphic_types.h"
 
 
 int syscall_depth = 0;
@@ -68,8 +71,9 @@ uint64_t syscall_read_shortcut(process_t *ctx){
 uint64_t syscall_get_mouse(process_t *ctx){
     //TODO: do we want to prevent the process from knowing what the mouse is doing outside the window unless it's explicitly allowed?
     if (get_current_proc_pid() != ctx->id) return 0;
-    mouse_input *inp = (mouse_input*)ctx->PROC_X0;
-    *inp = get_raw_mouse_in();
+    mouse_data *inp = (mouse_data*)ctx->PROC_X0;
+    inp->raw = get_raw_mouse_in();
+    inp->position = convert_mouse_position(get_mouse_pos());
     return 0;
 }
 
@@ -229,9 +233,9 @@ syscall_entry syscalls[] = {
     [FREE_CODE] = syscall_free,
     [PRINTL_CODE] = syscall_printl,
     [READ_KEY_CODE] = syscall_read_key,
-    [READ_EVENT_CODE] = syscall_read_event ,
+    [READ_EVENT_CODE] = syscall_read_event,
     [READ_SHORTCUT_CODE] = syscall_read_shortcut,
-    [GET_MOUSE_STATUS_CODE] = syscall_get_mouse ,
+    [GET_MOUSE_STATUS_CODE] = syscall_get_mouse,
     [REQUEST_DRAW_CTX_CODE] = syscall_gpu_request_ctx,
     [GPU_FLUSH_DATA_CODE] = syscall_gpu_flush,
     [GPU_CHAR_SIZE_CODE] = syscall_char_size,

shared/mouse_input.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "types.h"
+#include "ui/graphic_types.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -13,6 +14,15 @@ typedef struct {
     int8_t scroll;
 } mouse_input;
 
+typedef struct {
+    mouse_input raw;
+    gpu_point position;
+} mouse_data;
+
+static inline bool mouse_button_down(mouse_data* m, uint8_t button){
+    return (m->raw.buttons >> button) & 1;
+}
+
 #ifdef __cplusplus
 }
 #endif 

shared/syscalls/syscalls.h

@@ -21,7 +21,7 @@ extern void free_sized(void *ptr, size_t size);
 
 extern bool read_key(keypress *kp);
 extern bool read_event(kbd_event *event);
-extern void get_mouse_status(mouse_input *in);
+extern void get_mouse_status(mouse_data *in);
 
 extern void sleep(uint64_t time);
 extern void halt(int32_t exit_code);

user/default_process.c

@@ -1,4 +1,5 @@
 #include "default_process.h"
+#include "mouse_input.h"
 #include "syscalls/syscalls.h"
 #include "input_keycodes.h"
 #include "std/string.h"
@@ -29,6 +30,9 @@ int img_example() {
     ctx.height = info.height+BORDER*2;
     request_draw_ctx(&ctx);
     while (1) {
+        mouse_data data;
+        get_mouse_status(&data);
+        printf("data.position %ix%i",data.position.x,data.position.y);
         keypress kp = {};
         // printf("Print console test %f", (get_time()/1000.f));
         if (read_key(&kp))