diff --git a/Asuro.iso b/Asuro.iso index 3052967a..7b65430c 100644 Binary files a/Asuro.iso and b/Asuro.iso differ diff --git a/bin/kernel.bin b/bin/kernel.bin index 0c9a1f7f..eef8a61b 100755 Binary files a/bin/kernel.bin and b/bin/kernel.bin differ diff --git a/iso/boot/asuro.bin b/iso/boot/asuro.bin index 0c9a1f7f..eef8a61b 100755 Binary files a/iso/boot/asuro.bin and b/iso/boot/asuro.bin differ diff --git a/lib/console.o b/lib/console.o index 2d0517c3..9b5c6f05 100644 Binary files a/lib/console.o and b/lib/console.o differ diff --git a/lib/console.ppu b/lib/console.ppu index df11610e..a6f75a3c 100644 Binary files a/lib/console.ppu and b/lib/console.ppu differ diff --git a/lib/kernel.ppu b/lib/kernel.ppu index 92e91c48..0d3d6420 100644 Binary files a/lib/kernel.ppu and b/lib/kernel.ppu differ diff --git a/lib/libpconsole.a b/lib/libpconsole.a index 0c1518c0..dcc4b303 100644 Binary files a/lib/libpconsole.a and b/lib/libpconsole.a differ diff --git a/lib/libpmultiboot.a b/lib/libpmultiboot.a index 3240904c..5b2c9a57 100644 Binary files a/lib/libpmultiboot.a and b/lib/libpmultiboot.a differ diff --git a/lib/libpsystem.a b/lib/libpsystem.a index bd26beff..574c93e0 100644 Binary files a/lib/libpsystem.a and b/lib/libpsystem.a differ diff --git a/lib/mouse.ppu b/lib/mouse.ppu index 86501a38..5f8e6ab9 100644 Binary files a/lib/mouse.ppu and b/lib/mouse.ppu differ diff --git a/src/console.pas b/src/console.pas index e62045c6..c0a7e708 100644 --- a/src/console.pas +++ b/src/console.pas @@ -196,7 +196,7 @@ begin dest:= puint16(multibootinfo^.framebuffer_addr); dest:= dest + (y * 1280) + x; dest64:= puint64(dest); - getPixel64:= dest64[0]; + getPixel64:= dest64^; end; procedure drawPixel64(x : uint32; y : uint32; pixel : uint64); @@ -208,7 +208,7 @@ begin dest:= puint16(multibootinfo^.framebuffer_addr); dest:= dest + (y * 1280) + x; dest64:= puint64(dest); - dest64[0]:= pixel; + dest64^:= pixel; end; procedure outputCharToScreenSpace(c : char; x : uint8; y : uint8; fgcolor : uint16); @@ -224,7 +224,7 @@ begin fgcolor32:= fgcolor OR (fgcolor SHL 16); mask:= puint32(@Std_Mask[uint32(c) * (16 * 8)]); dest:= puint16(multibootinfo^.framebuffer_addr); - dest:= dest + (y*1280) + x; + dest:= dest + (y * 1280) + x; dest32:= puint32(dest); for i:=0 to 15 do begin dest32[(i*640)+0]:= (dest32[(i*640)+0] AND NOT(mask[(i*4)+0])) OR (fgcolor32 AND mask[(i*4)+0]); diff --git a/src/driver/hid/mouse.pas b/src/driver/hid/mouse.pas index 3a8181c3..071977a3 100644 --- a/src/driver/hid/mouse.pas +++ b/src/driver/hid/mouse.pas @@ -72,7 +72,7 @@ begin end;} for y:=0 to 7 do begin for x:=0 to 1 do begin - drawPixel64(Last.x + x * 4, Last.y + y, BackPixels[x][y]); + drawPixel64(Last.x + (x * 4), Last.y + y, BackPixels[x][y]); end; end; end; @@ -86,7 +86,7 @@ begin end;} for y:=0 to 7 do begin for x:=0 to 1 do begin - BackPixels[x][y]:= GetPixel64(nx + x * 4, ny + y); + BackPixels[x][y]:= GetPixel64(nx + (x * 4), ny + y); end; end; outputCharToScreenSpace(char(0), nx, ny, $FFFF); diff --git a/src/kernel.pas b/src/kernel.pas index 4033a4f0..b472d4db 100644 --- a/src/kernel.pas +++ b/src/kernel.pas @@ -287,7 +287,7 @@ begin tracer.push_trace('kmain.END'); - outputCharToScreenSpace(char(0), 10, 10, $FFFF); + //outputCharToScreenSpace(char(0), 10, 10, $FFFF); while true do begin mouse.DrawCursor();