From 6988840029c81dd7f494ebb93af11613ae79f0f0 Mon Sep 17 00:00:00 2001 From: miguel Date: Thu, 28 Aug 2014 01:24:49 +0200 Subject: added small charactes to fool-font ! --- binfont.src | 1373 ++++++++++++++++++++++++++++++++++++++++++++------------- kernel/vesa.c | 10 +- 2 files changed, 1066 insertions(+), 317 deletions(-) diff --git a/binfont.src b/binfont.src index 2a45476..127cefa 100644 --- a/binfont.src +++ b/binfont.src @@ -1,4 +1,821 @@ -// unknown + +// space (ox2o) + +________ +________ +________ +________ +________ +________ +________ +________ +________ +________ + +// ! + +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 + +// / + +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 +XXXXXXXX +XX____XX +XX____XX +XXXXXXXX +XXXXXXXX +XX____XX +XX____XX +XX____XX +XX____XX + +// B + +XXXXXXX_ +XXXXXXXX +XX____XX +XX____XX +XXXXXXX_ +XXXXXXX_ +XX____XX +XX____XX +XXXXXXXX +XXXXXXX_ + +// C + +XXXXXXXX +XXXXXXXX +XX______ +XX______ +XX______ +XX______ +XX______ +XX______ +XXXXXXXX +XXXXXXXX + +// D + +XXXXXX__ +XXXXXXX_ +XX___XXX +XX____XX +XX____XX +XX____XX +XX____XX +XX___XXX +XXXXXXX_ +XXXXXX__ + +// E + +XXXXXXXX +XXXXXXXX +XX______ +XX______ +XXXXXXX_ +XXXXXXX_ +XX______ +XX______ +XXXXXXXX +XXXXXXXX + +// F + +XXXXXXXX +XXXXXXXX +XX______ +XX______ +XXXXXXX_ +XXXXXXX_ +XX______ +XX______ +XX______ +XX______ + +// G + +XXXXXXXX +XXXXXXXX +XX______ +XX______ +XX__XXXX +XX__XXXX +XX____XX +XX____XX +XXXXXXXX +XXXXXXXX + +// H + +XX____XX +XX____XX +XX____XX +XX____XX +XXXXXXXX +XXXXXXXX +XX____XX +XX____XX +XX____XX +XX____XX + +// I + +_XXXXXX_ +___XX___ +___XX___ +___XX___ +___XX___ +___XX___ +___XX___ +___XX___ +___XX___ +_XXXXXX_ + +// J + +XXXXXXXX +XXXXXXXX +______XX +______XX +______XX +______XX +XX____XX +XXX___XX +_XXXXXXX +__XXXXXX + +// K + +XX____XX +XX__XXX_ +XX__XXX_ +XX_XXX__ +XXXX____ +XXXX____ +XX_XXX__ +XX__XXX_ +XX__XXX_ +XX____XX + +// L + +XX______ +XX______ +XX______ +XX______ +XX______ +XX______ +XX______ +XX______ +XXXXXXXX +XXXXXXXX + +// M + +XX____XX +XXX__XXX +XXX_XXXX +XXXXXXXX +XXXXXXXX +XX_XX_XX +XX_XX_XX +XX____XX +XX____XX +XX____XX + +// N + +XX____XX +XXX___XX +XXX___XX +XXXX__XX +XXXXX_XX +XX_XXXXX +XX__XXXX +XX___XXX +XX___XXX +XX____XX + +// O + +_XXXXXX_ +XXXXXXXX +XX____XX +XX____XX +XX____XX +XX____XX +XX____XX +XX____XX +XXXXXXXX +_XXXXXX_ + +// P + +XXXXXXX_ +XXXXXXXX +XX____XX +XX____XX +XXXXXXXX +XXXXXXX_ +XX______ +XX______ +XX______ +XX______ + +// Q + +_XXXXXX_ +XXXXXXXX +XX____XX +XX____XX +XX____XX +XX_XX_XX +XX_XXXXX +XX__XXXX +XXXXXXXX +_XXXXXXX + +// R + +XXXXXXX_ +XXXXXXXX +XX____XX +XX____XX +XXXXXXXX +XXXXXXX_ +XXXXX___ +XX_XXX__ +XX__XXX_ +XX___XXX + +// S + +_XXXXXX_ +XXXXXXXX +XX____XX +_XX___X_ +__XX____ +___XXX__ +_X__XXX_ +XX___XXX +XXXXXXXX +_XXXXXX_ + +// T + +XXXXXXXX +XXXXXXXX +___XX___ +___XX___ +___XX___ +___XX___ +___XX___ +___XX___ +___XX___ +___XX___ + +// U + +XX____XX +XX____XX +XX____XX +XX____XX +XX____XX +XX____XX +XX____XX +XX____XX +XXXXXXXX +_XXXXXX_ + +// V + +XX____XX +XX____XX +XX____XX +_XX__XX_ +_XX__XX_ +_XX__XX_ +__XXXX__ +__XXXX__ +___XX___ +___XX___ + +// W + +XX____XX +XX____XX +XX_XX_XX +XX_XX_XX +XXXXXXXX +XXXXXXXX +XXX__XXX +XXX__XXX +XX____XX +XX____XX + +// x big + +XX____XX +XX____XX +_XX__XX_ +_XX__XX_ +__XXXX__ +__XXXX__ +_XX__XX_ +_XX__XX_ +XX____XX +XX____XX + +// Y + +XX____XX +XX____XX +_XX__XX_ +_XX__XX_ +__XXXX__ +__XXXX__ +___XX___ +___XX___ +___XX___ +___XX___ + +// Z + +XXXXXXXX +XXXXXXXX +_____XXX +_____XXX +____XXX_ +___XXX__ +_XXX____ +XXX_____ +XXXXXXXX +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 @@ -11,74 +828,99 @@ X_XXXX_X X______X XXXXXXXX -// A +// 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 -XX____XX -XX____XX + +// ` + 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 -XX____XX -XX____XX -XX____XX -XX____XX - -// B -XXXXXXX_ +// a +________ +________ +_XXXXXX_ +XXXXXXXX +______XX +_XXXXXXX XXXXXXXX XX____XX -XX____XX +XXXXXXXX +_XXXX_XX + +// b + +XX______ +XX______ +XX______ +XX______ XXXXXXX_ XXXXXXX_ XX____XX XX____XX -XXXXXXXX +XXXXXXX_ XXXXXXX_ -// C +// c +________ +________ +________ +_XXXXXX_ XXXXXXXX -XXXXXXXX -XX______ -XX______ -XX______ XX______ XX______ XX______ XXXXXXXX -XXXXXXXX +_XXXXXX_ -// D +// d -XXXXXX__ -XXXXXXX_ -XX___XXX -XX____XX -XX____XX +______XX +______XX +______XX +______XX +_XXXXXXX +_XXXXXXX XX____XX XX____XX -XX___XXX -XXXXXXX_ -XXXXXX__ +_XXXXXXX +_XXXXXXX -// E +// e +________ +________ +_XXXXXX_ XXXXXXXX -XXXXXXXX -XX______ -XX______ -XXXXXXX_ +XX_____X XXXXXXX_ XX______ XX______ XXXXXXXX -XXXXXXXX +_XXXXXX_ -// F +// f -XXXXXXXX +_XXXXXX_ XXXXXXXX XX______ XX______ @@ -89,407 +931,314 @@ XX______ XX______ XX______ -// G +// g -XXXXXXXX -XXXXXXXX -XX______ -XX______ -XX__XXXX -XX__XXXX +________ +________ +_XXXXXXX +_XXXXXXX XX____XX XX____XX -XXXXXXXX -XXXXXXXX +_XXXXXXX +______XX +XX____XX +_XXXXXXX -// H +// h -XX____XX -XX____XX -XX____XX -XX____XX -XXXXXXXX +XX______ +XX______ +XX______ +XX______ +XXXXXXX_ XXXXXXXX XX____XX XX____XX XX____XX XX____XX -// I -_XXXXXX_ -___XX___ -___XX___ -___XX___ +// i + +________ +________ +________ ___XX___ +________ ___XX___ ___XX___ ___XX___ ___XX___ -_XXXXXX_ +__XXXX__ -// J -XXXXXXXX -XXXXXXXX -______XX -______XX -______XX -______XX -XX____XX -XXX___XX -_XXXXXXX -__XXXXXX +// j -// K +________ +________ +____XX__ +________ +____XX__ +____XX__ +____XX__ +_XX_XX__ +_XX_XX__ +__XXX___ -XX____XX -XX__XXX_ -XX__XXX_ -XX_XXX__ -XXXX____ -XXXX____ -XX_XXX__ -XX__XXX_ -XX__XXX_ -XX____XX +// k -// L XX______ XX______ XX______ XX______ -XX______ -XX______ -XX______ -XX______ -XXXXXXXX -XXXXXXXX +XX____XX +XX__XXX_ +XXXXXX__ +XX_XXX__ +XX__XXX_ +XX___XXX -// M +// l -XX____XX -XXX__XXX -XXX_XXXX -XXXXXXXX + +_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 - -// N - -XX____XX -XXX___XX -XXX___XX -XXXX__XX -XXXXX_XX -XX_XXXXX -XX__XXXX -XX___XXX -XX___XXX XX____XX -// O - +// o +________ +________ +________ _XXXXXX_ XXXXXXXX XX____XX XX____XX XX____XX -XX____XX -XX____XX -XX____XX XXXXXXXX _XXXXXX_ -// P - -XXXXXXX_ +// p +________ +________ +_XXXXXX_ XXXXXXXX XX____XX XX____XX -XXXXXXXX XXXXXXX_ XX______ XX______ XX______ -XX______ -// Q +// q +________ +________ _XXXXXX_ XXXXXXXX XX____XX XX____XX -XX____XX -XX_XX_XX -XX_XXXXX -XX__XXXX -XXXXXXXX _XXXXXXX +______XX +______XX +______XX -// R - -XXXXXXX_ -XXXXXXXX -XX____XX -XX____XX -XXXXXXXX -XXXXXXX_ -XXXXX___ -XX_XXX__ -XX__XXX_ -XX___XXX +// r +________ +________ +________ +XX__XX__ +XX_XXXX_ +XXXX__XX +XX______ +XX______ +XX______ +XX______ -// S +// s +________ +________ +________ _XXXXXX_ -XXXXXXXX XX____XX -_XX___X_ -__XX____ -___XXX__ -_X__XXX_ -XX___XXX -XXXXXXXX +_XX_____ +__XXXX__ +_____XX_ +XX____XX _XXXXXX_ -// T - -XXXXXXXX -XXXXXXXX -___XX___ -___XX___ -___XX___ -___XX___ -___XX___ -___XX___ -___XX___ -___XX___ +// t -// U +__XX____ +__XX____ +XXXXXX__ +XXXXXX__ +__XX____ +__XX____ +__XX____ +__XX__X_ +__XX_XX_ +___XXX__ +// u +________ +________ +________ +________ XX____XX XX____XX XX____XX XX____XX XX____XX -XX____XX -XX____XX -XX____XX -XXXXXXXX _XXXXXX_ -// V - -XX____XX +// v +________ +________ +________ +________ XX____XX XX____XX _XX__XX_ _XX__XX_ -_XX__XX_ -__XXXX__ __XXXX__ ___XX___ -___XX___ - -// W -XX____XX -XX____XX +// w +________ +________ +________ +________ +XX_XX_XX +XX_XX_XX XX_XX_XX XX_XX_XX XXXXXXXX -XXXXXXXX -XXX__XXX -XXX__XXX -XX____XX -XX____XX +_XX__XX_ -// x big -XX____XX +// x + +________ +________ +________ XX____XX _XX__XX_ _XX__XX_ __XXXX__ -__XXXX__ _XX__XX_ _XX__XX_ XX____XX -XX____XX -// Y -XX____XX +// y + +________ +________ +________ XX____XX _XX__XX_ _XX__XX_ __XXXX__ -__XXXX__ -___XX___ -___XX___ ___XX___ -___XX___ - -// Z - -XXXXXXXX -XXXXXXXX -_____XXX -_____XXX -____XXX_ -___XXX__ -_XXX____ -XXX_____ -XXXXXXXX -XXXXXXXX +__XX____ +_XX_____ -// space +// z ________ ________ ________ ________ -________ -________ -________ -________ -________ -________ - -// 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__ -___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 +_XX_____ XXXXXXXX -_XXXXXX_ -// 6 +// { -_XXXXXX_ XXXXXXXX -XX______ -XX______ -XXXXXXX_ -XXXXXXX_ -XX____XX -XX____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_ -// 7 +// | 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 -_____XXX -____XXX_ -____XXX_ -___XXX__ -___XXX__ -__XXX___ -__XXX___ -_XXX____ -// 8 +// } -_XXXXXX_ XXXXXXXX -XX____XX -XX____XX -_XXXXXX_ -_XXXXXX_ -XX____XX -XX____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_ -// 9 +// ~ -_XXXXXX_ XXXXXXXX -XX____XX -XX____XX -_XXXXXXX -_XXXXXXX -______XX -______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_ - 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; -- cgit v1.2.3