diff options
| -rw-r--r-- | binfont.src | 909 | ||||
| -rw-r--r-- | kernel/vesa.c | 10 |
2 files changed, 834 insertions, 85 deletions
diff --git a/binfont.src b/binfont.src index 2a45476..127cefa 100644 --- a/binfont.src +++ b/binfont.src @@ -1,4 +1,18 @@ -// unknown + +// space (ox2o) + +________ +________ +________ +________ +________ +________ +________ +________ +________ +________ + +// ! XXXXXXXX X______X @@ -11,6 +25,413 @@ X_XXXX_X X______X XXXXXXXX +// " + +XXXXXXXX +X______X +X_XXXX_X +X_X__X_X +X_X__X_X +X_X__X_X +X_X__X_X +X_XXXX_X +X______X +XXXXXXXX + +// # + +XXXXXXXX +X______X +X_XXXX_X +X_X__X_X +X_X__X_X +X_X__X_X +X_X__X_X +X_XXXX_X +X______X +XXXXXXXX + +// $ + +XXXXXXXX +X______X +X_XXXX_X +X_X__X_X +X_X__X_X +X_X__X_X +X_X__X_X +X_XXXX_X +X______X +XXXXXXXX + +// % + +XXXXXXXX +X______X +X_XXXX_X +X_X__X_X +X_X__X_X +X_X__X_X +X_X__X_X +X_XXXX_X +X______X +XXXXXXXX + +// & + +XXXXXXXX +X______X +X_XXXX_X +X_X__X_X +X_X__X_X +X_X__X_X +X_X__X_X +X_XXXX_X +X______X +XXXXXXXX + +// ' + +XXXXXXXX +X______X +X_XXXX_X +X_X__X_X +X_X__X_X +X_X__X_X +X_X__X_X +X_XXXX_X +X______X +XXXXXXXX + +// ( + +XXXXXXXX +X______X +X_XXXX_X +X_X__X_X +X_X__X_X +X_X__X_X +X_X__X_X +X_XXXX_X +X______X +XXXXXXXX + +// ) + +XXXXXXXX +X______X +X_XXXX_X +X_X__X_X +X_X__X_X +X_X__X_X +X_X__X_X +X_XXXX_X +X______X +XXXXXXXX + +// * + +XXXXXXXX +X______X +X_XXXX_X +X_X__X_X +X_X__X_X +X_X__X_X +X_X__X_X +X_XXXX_X +X______X +XXXXXXXX + +// + + +XXXXXXXX +X______X +X_XXXX_X +X_X__X_X +X_X__X_X +X_X__X_X +X_X__X_X +X_XXXX_X +X______X +XXXXXXXX + +// , + +XXXXXXXX +X______X +X_XXXX_X +X_X__X_X +X_X__X_X +X_X__X_X +X_X__X_X +X_XXXX_X +X______X +XXXXXXXX + +// - + +XXXXXXXX +X______X +X_XXXX_X +X_X__X_X +X_X__X_X +X_X__X_X +X_X__X_X +X_XXXX_X +X______X +XXXXXXXX + +// . + +XXXXXXXX +X______X +X_XXXX_X +X_X__X_X +X_X__X_X +X_X__X_X +X_X__X_X +X_XXXX_X +X______X +XXXXXXXX + +// / + +XXXXXXXX +X______X +X_XXXX_X +X_X__X_X +X_X__X_X +X_X__X_X +X_X__X_X +X_XXXX_X +X______X +XXXXXXXX + + +// zero + +_XXXXXX_ +XXXXXXXX +XX___XXX +XX__X_XX +XX__X_XX +XX_X__XX +XX_X__XX +XXX___XX +XXXXXXXX +_XXXXXX_ + +// one + +___XX___ +__XXX___ +__XXX___ +_XXXX___ +XX_XX___ +___XX___ +___XX___ +___XX___ +___XX___ +_XXXXXX_ + +// 2 + +_XXXXXX_ +XXXXXXXX +_____XXX +_____XXX +____XXX_ +___XXX__ +_XXX____ +XXX_____ +XXXXXXXX +XXXXXXXX + +// 3 + +XXXXXXXX +XXXXXXXX +_____XXX +____XX__ +___XX___ +__XXX___ +____XXX_ +XX___XXX +XXXXXXXX +_XXXXXX_ + +// 4 + +___XX___ +__XXX___ +__XXX___ +_XXXX___ +XX_XX___ +XXXXXXXX +XXXXXXXX +___XX___ +___XX___ +___XX___ + +// 5 + +XXXXXXXX +XXXXXXXX +XXX_____ +XXX_____ +XXXXXXX_ +_XXXXXXX +______XX +X_____XX +XXXXXXXX +_XXXXXX_ + +// 6 + +_XXXXXX_ +XXXXXXXX +XX______ +XX______ +XXXXXXX_ +XXXXXXX_ +XX____XX +XX____XX +XXXXXXXX +_XXXXXX_ + +// 7 + +XXXXXXXX +XXXXXXXX +_____XXX +____XXX_ +____XXX_ +___XXX__ +___XXX__ +__XXX___ +__XXX___ +_XXX____ + +// 8 + +_XXXXXX_ +XXXXXXXX +XX____XX +XX____XX +_XXXXXX_ +_XXXXXX_ +XX____XX +XX____XX +XXXXXXXX +_XXXXXX_ + +// 9 + +_XXXXXX_ +XXXXXXXX +XX____XX +XX____XX +_XXXXXXX +_XXXXXXX +______XX +______XX +XXXXXXXX +_XXXXXX_ + + +// : + +XXXXXXXX +X______X +X_XXXX_X +X_X__X_X +X_X__X_X +X_X__X_X +X_X__X_X +X_XXXX_X +X______X +XXXXXXXX + +// ; + +XXXXXXXX +X______X +X_XXXX_X +X_X__X_X +X_X__X_X +X_X__X_X +X_X__X_X +X_XXXX_X +X______X +XXXXXXXX + +// < + +XXXXXXXX +X______X +X_XXXX_X +X_X__X_X +X_X__X_X +X_X__X_X +X_X__X_X +X_XXXX_X +X______X +XXXXXXXX + +// = + +XXXXXXXX +X______X +X_XXXX_X +X_X__X_X +X_X__X_X +X_X__X_X +X_X__X_X +X_XXXX_X +X______X +XXXXXXXX + +// > + +XXXXXXXX +X______X +X_XXXX_X +X_X__X_X +X_X__X_X +X_X__X_X +X_X__X_X +X_XXXX_X +X______X +XXXXXXXX + +// ? + +XXXXXXXX +X______X +X_XXXX_X +X_X__X_X +X_X__X_X +X_X__X_X +X_X__X_X +X_XXXX_X +X______X +XXXXXXXX + +// @ + +XXXXXXXX +X______X +X_XXXX_X +X_X__X_X +X_X__X_X +X_X__X_X +X_X__X_X +X_XXXX_X +X______X +XXXXXXXX + + + // A XXXXXXXX @@ -349,98 +770,155 @@ XXX_____ XXXXXXXX XXXXXXXX -// space -________ -________ -________ -________ -________ -________ -________ -________ -________ -________ -// zero -_XXXXXX_ + + + +// [ + XXXXXXXX -XX___XXX -XX__X_XX -XX__X_XX -XX_X__XX -XX_X__XX -XXX___XX +X______X +X_XXXX_X +X_X__X_X +X_X__X_X +X_X__X_X +X_X__X_X +X_XXXX_X +X______X XXXXXXXX -_XXXXXX_ -// one +// \ -___XX___ -__XXX___ -__XXX___ -_XXXX___ -XX_XX___ -___XX___ -___XX___ -___XX___ -___XX___ -_XXXXXX_ +XXXXXXXX +X______X +X_XXXX_X +X_X__X_X +X_X__X_X +X_X__X_X +X_X__X_X +X_XXXX_X +X______X +XXXXXXXX -// 2 +// ] -_XXXXXX_ XXXXXXXX -_____XXX -_____XXX -____XXX_ -___XXX__ -_XXX____ -XXX_____ +X______X +X_XXXX_X +X_X__X_X +X_X__X_X +X_X__X_X +X_X__X_X +X_XXXX_X +X______X XXXXXXXX + +// ^ + +XXXXXXXX +X______X +X_XXXX_X +X_X__X_X +X_X__X_X +X_X__X_X +X_X__X_X +X_XXXX_X +X______X XXXXXXXX -// 3 +// underscore XXXXXXXX +X______X +X_XXXX_X +X_X__X_X +X_X__X_X +X_X__X_X +X_X__X_X +X_XXXX_X +X______X +XXXXXXXX + +// ` + XXXXXXXX -_____XXX -____XX__ -___XX___ -__XXX___ -____XXX_ -XX___XXX +X______X +X_XXXX_X +X_X__X_X +X_X__X_X +X_X__X_X +X_X__X_X +X_XXXX_X +X______X XXXXXXXX + +// a +________ +________ _XXXXXX_ +XXXXXXXX +______XX +_XXXXXXX +XXXXXXXX +XX____XX +XXXXXXXX +_XXXX_XX -// 4 +// b -___XX___ -__XXX___ -__XXX___ -_XXXX___ -XX_XX___ +XX______ +XX______ +XX______ +XX______ +XXXXXXX_ +XXXXXXX_ +XX____XX +XX____XX +XXXXXXX_ +XXXXXXX_ + +// c + +________ +________ +________ +_XXXXXX_ XXXXXXXX +XX______ +XX______ +XX______ XXXXXXXX -___XX___ -___XX___ -___XX___ +_XXXXXX_ -// 5 +// d +______XX +______XX +______XX +______XX +_XXXXXXX +_XXXXXXX +XX____XX +XX____XX +_XXXXXXX +_XXXXXXX + +// e + +________ +________ +_XXXXXX_ XXXXXXXX -XXXXXXXX -XXX_____ -XXX_____ +XX_____X XXXXXXX_ -_XXXXXXX -______XX -X_____XX +XX______ +XX______ XXXXXXXX _XXXXXX_ -// 6 +// f _XXXXXX_ XXXXXXXX @@ -448,48 +926,319 @@ XX______ XX______ XXXXXXX_ XXXXXXX_ +XX______ +XX______ +XX______ +XX______ + +// g + +________ +________ +_XXXXXXX +_XXXXXXX XX____XX XX____XX -XXXXXXXX -_XXXXXX_ +_XXXXXXX +______XX +XX____XX +_XXXXXXX -// 7 +// h +XX______ +XX______ +XX______ +XX______ +XXXXXXX_ XXXXXXXX -XXXXXXXX -_____XXX -____XXX_ -____XXX_ -___XXX__ -___XXX__ -__XXX___ +XX____XX +XX____XX +XX____XX +XX____XX + + +// i + +________ +________ +________ +___XX___ +________ +___XX___ +___XX___ +___XX___ +___XX___ +__XXXX__ + + +// j + +________ +________ +____XX__ +________ +____XX__ +____XX__ +____XX__ +_XX_XX__ +_XX_XX__ __XXX___ -_XXX____ -// 8 +// k + +XX______ +XX______ +XX______ +XX______ +XX____XX +XX__XXX_ +XXXXXX__ +XX_XXX__ +XX__XXX_ +XX___XXX + +// l + + +_XXXX___ +_XXXX___ +___XX___ +___XX___ +___XX___ +___XX___ +___XX___ +___XX___ +___XX___ _XXXXXX_ + + +// m +________ +________ +________ +XX______ +XXXX_XX_ +XXXXXXXX +XX_XX_XX +XX_XX_XX +XX_XX_XX +XX_XX_XX + +// n +________ +________ +________ +XX______ +XXXXXXX_ XXXXXXXX XX____XX XX____XX +XX____XX +XX____XX + +// o +________ +________ +________ _XXXXXX_ -_XXXXXX_ +XXXXXXXX +XX____XX XX____XX XX____XX XXXXXXXX _XXXXXX_ -// 9 +// p +________ +________ +_XXXXXX_ +XXXXXXXX +XX____XX +XX____XX +XXXXXXX_ +XX______ +XX______ +XX______ +// q + +________ +________ _XXXXXX_ XXXXXXXX XX____XX XX____XX _XXXXXXX -_XXXXXXX ______XX ______XX -XXXXXXXX +______XX + +// r +________ +________ +________ +XX__XX__ +XX_XXXX_ +XXXX__XX +XX______ +XX______ +XX______ +XX______ + +// s + +________ +________ +________ +_XXXXXX_ +XX____XX +_XX_____ +__XXXX__ +_____XX_ +XX____XX +_XXXXXX_ + +// t + +__XX____ +__XX____ +XXXXXX__ +XXXXXX__ +__XX____ +__XX____ +__XX____ +__XX__X_ +__XX_XX_ +___XXX__ + +// u +________ +________ +________ +________ +XX____XX +XX____XX +XX____XX +XX____XX +XX____XX _XXXXXX_ +// v +________ +________ +________ +________ +XX____XX +XX____XX +_XX__XX_ +_XX__XX_ +__XXXX__ +___XX___ + +// w +________ +________ +________ +________ +XX_XX_XX +XX_XX_XX +XX_XX_XX +XX_XX_XX +XXXXXXXX +_XX__XX_ + + +// x + +________ +________ +________ +XX____XX +_XX__XX_ +_XX__XX_ +__XXXX__ +_XX__XX_ +_XX__XX_ +XX____XX + + +// y + +________ +________ +________ +XX____XX +_XX__XX_ +_XX__XX_ +__XXXX__ +___XX___ +__XX____ +_XX_____ + + +// z +________ +________ +________ +________ +XXXXXXXX +_____XX_ +____XX__ +__XXX___ +_XX_____ +XXXXXXXX + +// { + +XXXXXXXX +X______X +X_XXXX_X +X_X__X_X +X_X__X_X +X_X__X_X +X_X__X_X +X_XXXX_X +X______X +XXXXXXXX + +// | + +XXXXXXXX +X______X +X_XXXX_X +X_X__X_X +X_X__X_X +X_X__X_X +X_X__X_X +X_XXXX_X +X______X +XXXXXXXX + +// } + +XXXXXXXX +X______X +X_XXXX_X +X_X__X_X +X_X__X_X +X_X__X_X +X_X__X_X +X_XXXX_X +X______X +XXXXXXXX + +// ~ + +XXXXXXXX +X______X +X_XXXX_X +X_X__X_X +X_X__X_X +X_X__X_X +X_X__X_X +X_XXXX_X +X______X +XXXXXXXX diff --git a/kernel/vesa.c b/kernel/vesa.c index 2a8230c..e8990b5 100644 --- a/kernel/vesa.c +++ b/kernel/vesa.c @@ -107,15 +107,15 @@ void PutPixel(int x,int y, int color){ //cTemp[x+y+2] = (uint8_t)((color>>16) & 0xff); } + void PutFont(char c, int x,int y, int color) { - int fnt=0; + int fnt=0x126-0x20; + + if(c>=0x20&&c<=0x126)fnt=c-0x20; + - if(c>='A'&&c<='Z')fnt=c-'A'+1; - else if(c>='a'&&c<='z')fnt=c-'a'+1; - else if(c>='0'&&c<='9')fnt=c-'0'+28; - else if(c==' ')fnt=27; int posx, posy, sizex=8, sizey=10; |