[feat] 简易鼠标驱动

kernel/graphics/layer.cpp

@@ -5,6 +5,7 @@
 #include <memory/pmm.h>
 #include <scheduler.h>
 #include <serial.h>
+#include <devices/cursor.h>
 #include <interrupt/idt.h>
 #include <interrupt/pic.h>
 #include <string_utils.h>
@@ -102,12 +103,6 @@ layer_t* layer_create(const char* name, layer_type_t type, UINT32 w, UINT32 h) {
 
     layer_insert_sorted(layer);
 
-    serial_write("LAYER: created '");
-    serial_write(name);
-    serial_write("' id=");
-    serial_write_hex(id);
-    serial_write("\n");
-
     return layer;
 }
 
@@ -126,10 +121,6 @@ void layer_destroy(layer_t* layer) {
         g_switch_target = NULL;
         g_switch_pending = false;
     }
-
-    serial_write("LAYER: destroyed '");
-    serial_write(layer->name);
-    serial_write("'\n");
 }
 
 layer_t* layer_get_by_id(UINT32 id) {
@@ -234,16 +225,10 @@ void layer_init(void) {
     // 注册键盘 IRQ 并取消屏蔽
     idt_set_handler(PIC_IRQ_BASE + 1, ps2_irq_handler);
     pic_unmask_irq(1);
-
-    serial_write("LAYER: compositor init OK (back buffer = ");
-    serial_write_hex(buf_size);
-    serial_write(" bytes)\n");
 }
 
 // 合成器任务
 void layer_compositor_task(void) {
-    serial_write("LAYER: compositor task running\n");
-
     UINT32 hr = g_gfx.hr;
     UINT32 vr = g_gfx.vr;
 
@@ -255,12 +240,12 @@ void layer_compositor_task(void) {
             if (target && target->visible && target->type == LAYER_TYPE_WINDOW) {
                 g_focused = target;
                 layer_set_z(target, 99);
-                serial_write("LAYER: Shift+F10 -> '");
-                serial_write(target->name);
-                serial_write("'\n");
             }
         }
 
+        // 更新光标位置
+        cursor_update();
+
         // 清除后台缓冲区
         EFI_GRAPHICS_OUTPUT_BLT_PIXEL black = {0, 0, 0, 0};
         draw_set_target(g_back_buffer, hr, vr);
@@ -281,14 +266,17 @@ void layer_compositor_task(void) {
                 if (dy + (SSINT32)sh > (SSINT32)vr) sh = vr - dy;
                 if (sw == 0 || sh == 0) { cur = cur->next; continue; }
 
+                bool use_alpha = (cur->type == LAYER_TYPE_MOUSE);
                 for (UINT32 row = 0; row < sh; row++) {
                     EFI_GRAPHICS_OUTPUT_BLT_PIXEL* src = cur->buffer + ((UINTN)cur->w * (sy + row)) + sx;
                     EFI_GRAPHICS_OUTPUT_BLT_PIXEL* dst = g_back_buffer + ((UINTN)hr * (dy + row)) + dx;
                     for (UINT32 col = 0; col < sw; col++) {
-                        dst->Blue  = src->Blue;
-                        dst->Green = src->Green;
-                        dst->Red   = src->Red;
-                        dst->Reserved = src->Reserved;
+                        if (!use_alpha || src->Reserved != 0) {
+                            dst->Blue  = src->Blue;
+                            dst->Green = src->Green;
+                            dst->Red   = src->Red;
+                            dst->Reserved = src->Reserved;
+                        }
                         src++;
                         dst++;
                     }

kernel/main.cpp

@@ -15,6 +15,8 @@
 #include <interrupt/idt.h>
 #include <interrupt/pic.h>
 #include <interrupt/pit.h>
+#include <devices/mouse.h>
+#include <devices/cursor.h>
 
 extern EFI_SYSTEM_TABLE *ST;
 
@@ -146,6 +148,10 @@ extern "C" void kernel_main() {
     // 注册 IRQ 处理函数（向量 0x20 = PIC_IRQ_BASE + 0）
     idt_set_handler(PIC_IRQ_BASE + 0, irq_handler);
 
+    // 初始化 PS/2 鼠标驱动
+    serial_write("Sylva: init mouse...\n");
+    mouse_init();
+
     serial_write("Sylva: init PIT...\n");
     pit_init();
     pit_set_tick_handler(scheduler_tick);
@@ -160,6 +166,9 @@ extern "C" void kernel_main() {
     // 初始化合成器（分配后台缓冲区，注册键盘处理）
     layer_init();
 
+    // 初始化鼠标光标
+    cursor_init();
+
     // 创建桌面图层（全屏，z=0）
     layer_t* desktop = layer_create("desktop", LAYER_TYPE_DESKTOP, g_gfx.hr, g_gfx.vr);
     if (desktop) {