diff options
author | Andreas Baumann <mail@andreasbaumann.cc> | 2017-06-25 09:35:29 +0200 |
---|---|---|
committer | Andreas Baumann <mail@andreasbaumann.cc> | 2017-06-25 09:35:29 +0200 |
commit | 96d1781a9ba365baef0f89ef85a2b103bfd6370a (patch) | |
tree | b435c4fb19cb587495b96829dc9862ca3bb28311 /src/kernel | |
parent | e77368940afaa2bbc7bd883ef6cd25a5565a1bbd (diff) | |
download | abaos-96d1781a9ba365baef0f89ef85a2b103bfd6370a.tar.gz abaos-96d1781a9ba365baef0f89ef85a2b103bfd6370a.tar.bz2 |
put the mouse object into the global context so we can adjust the
resolution when switching video modes
Diffstat (limited to 'src/kernel')
-rw-r--r-- | src/kernel/kernel.c | 61 |
1 files changed, 41 insertions, 20 deletions
diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c index b17baf4..3135a25 100644 --- a/src/kernel/kernel.c +++ b/src/kernel/kernel.c @@ -42,6 +42,7 @@ typedef struct { driver_manager_t driver_manager; vga_t vga; mode_t mode; + mouse_t mouse; } global_context_t; static global_context_t global_context; @@ -92,12 +93,11 @@ void kernel_main( void ) interrupts_register_interrupt_handler( keyboard_interrupt_handler ); driver_manager_add_driver( &global_context.driver_manager, (driver_t *)&keyboard ); - mouse_t mouse; - mouse_init( &mouse, &handle_mouse_event, (void *)&global_context ); + mouse_init( &global_context.mouse, &handle_mouse_event, global_context.vga_text.res_x, global_context.vga_text.res_y, (void *)&global_context ); interrupt_handler_t mouse_interrupt_handler; - interrupt_handler_init( &mouse_interrupt_handler, IRQ_BASE + 0x0C, &interrupt, mouse_handle_interrupt, &mouse ); + interrupt_handler_init( &mouse_interrupt_handler, IRQ_BASE + 0x0C, &interrupt, mouse_handle_interrupt, &global_context.mouse ); interrupts_register_interrupt_handler( mouse_interrupt_handler ); - driver_manager_add_driver( &global_context.driver_manager, (driver_t *)&mouse ); + driver_manager_add_driver( &global_context.driver_manager, (driver_t *)&global_context.mouse ); // exit point in case of kernel panic, do this as soon as // possible @@ -165,6 +165,7 @@ static void handle_keyboard_event( keyboard_event_t *event, void *context ) vga_text_t *vga_text = &global_context->vga_text; driver_manager_t *driver_manager = &global_context->driver_manager; vga_t *vga = &global_context->vga; + mouse_t *mouse = &global_context->mouse; vga_text_hide_mouse_cursor( vga_text ); @@ -220,14 +221,17 @@ static void handle_keyboard_event( keyboard_event_t *event, void *context ) // as vga_t is equals to the graphical context for now ((widget_vtable_t *)desktop.vtable)->draw( &desktop, vga ); + + mouse_set_resolution( mouse, vga->mode.x, vga->mode.y ); } global_context->mode = MODE_GRAPHICS; break; case MODE_GRAPHICS: if( vga_set_mode( vga, vga_make_mode( VGA_MODE_TYPE_TEXT, 640, 480, 4 ) ) ) { + mouse_set_resolution( mouse, vga_text->res_x, vga_text->res_y ); + global_context->mode = MODE_TEXT; } - global_context->mode = MODE_TEXT; break; } } else { @@ -250,25 +254,42 @@ static void handle_mouse_event( mouse_event_t *event, void *context ) { global_context_t *global_context = (global_context_t *)context; vga_text_t *vga_text = &global_context->vga_text; + vga_t *vga = &global_context->vga; - switch( event->type ) { - case MOUSE_EVENT_TYPE_BUTTON_UP: - vga_text_hide_mouse_cursor( vga_text ); - printf( "MOUSE UP %d AT X:%d, Y:%d\n", event->button, event->cursor_x, - event->cursor_y ); - vga_text_show_mouse_cursor( vga_text ); + switch( global_context->mode ) { + case MODE_TEXT: + switch( event->type ) { + case MOUSE_EVENT_TYPE_BUTTON_UP: + vga_text_hide_mouse_cursor( vga_text ); + printf( "MOUSE UP %d AT X:%d, Y:%d\n", event->button, event->cursor_x, + event->cursor_y ); + vga_text_show_mouse_cursor( vga_text ); + break; + + case MOUSE_EVENT_TYPE_BUTTON_DOWN: + vga_text_hide_mouse_cursor( vga_text ); + printf( "MOUSE DOWN %d AT X:%d, Y:%d\n", event->button, event->cursor_x, + event->cursor_y ); + vga_text_show_mouse_cursor( vga_text ); + break; + + case MOUSE_EVENT_TYPE_MOVE: + vga_text_move_mouse_cursor( vga_text, event->cursor_x, event->cursor_y ); + vga_text_show_mouse_cursor( vga_text ); + break; + } break; - case MOUSE_EVENT_TYPE_BUTTON_DOWN: - vga_text_hide_mouse_cursor( vga_text ); - printf( "MOUSE DOWN %d AT X:%d, Y:%d\n", event->button, event->cursor_x, - event->cursor_y ); - vga_text_show_mouse_cursor( vga_text ); - break; + case MODE_GRAPHICS: + switch( event->type ) { + case MOUSE_EVENT_TYPE_BUTTON_UP: + case MOUSE_EVENT_TYPE_BUTTON_DOWN: + break; - case MOUSE_EVENT_TYPE_MOVE: - vga_text_move_mouse_cursor( vga_text, event->cursor_x, event->cursor_y ); - vga_text_show_mouse_cursor( vga_text ); + case MOUSE_EVENT_TYPE_MOVE: + vga_set_pixel( vga, event->cursor_x, event->cursor_y, VGA_COLOR_WHITE ); + break; + } break; } } |