Aren/toaruos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[kbd/mouse] Clean up

Browse Source
This commit is contained in:
Kevin Lange 2011-12-07 20:58:25 -06:00
parent c54de06083
commit 3d916ea911
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/core/kbd.c
View File

@ -233,9 +233,11 @@ void
keyboard_handler(
struct regs *r
) {
IRQ_OFF;
unsigned char scancode;
keyboard_wait();
scancode = inportb(KEY_DEVICE);
IRQ_ON;
if (keyboard_direct_handler) {
keyboard_direct_handler(scancode);
return;

11
kernel/core/mouse.c
View File

@ -113,6 +113,7 @@ void load_sprite(sprite_t * sprite, char * filename) {
}
free(bufferb);
}
void init_cursor(char * filename, char * alpha) {
cursor = malloc(sizeof(sprite_t));
load_sprite(cursor, filename);
@ -128,6 +129,7 @@ void init_cursor(char * filename, char * alpha) {
}
void mouse_handler(struct regs *r) {
IRQ_OFF;
switch (mouse_cycle) {
case 0:
mouse_byte[0] = inportb(0x60);
@ -152,22 +154,15 @@ void mouse_handler(struct regs *r) {
if (actual_y > 7670) actual_y = 7670;
short c_x = (short)(previous_x / 10 / 8);
short c_y = (short)((7670 - previous_y) / 10 / 12);
//short b_x = (short)(actual_x / 10 / 8);
//short b_y = (short)((7670 - actual_y) / 10 / 12);
for (short i = c_x - 2; i < c_x + 3; ++i) {
for (short j = c_y - 2; j < c_y + 3; ++j) {
bochs_redraw_cell(i,j);
}
}
/*
uint8_t sprite = 0;
if ((mouse_byte[0] & 0x01) == 0x01) sprite = 1;
if ((mouse_byte[0] & 0x02) == 0x02) sprite = 2;
*/
//bochs_fill_rect(b_x * 8, b_y * 12,8,12,color);
draw_sprite(cursor, actual_x / 10 - 24, 767 - actual_y / 10 - 24);
break;
}
IRQ_ON;
}
void mouse_wait(uint8_t a_type) {