From: Lawrence S. <ljs...@us...> - 2020-07-19 01:31:55
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "A pseudo Operating System for the Dreamcast.". The branch, master has been updated via 06bb113b77f338d529b929cb08c463ad459ff19a (commit) via 938f6f8fee6b671465519e3081d91c49c47d3345 (commit) via 0dc4dd5a038eb04c664b40d6658c6a84edd6bade (commit) via 384139ad5acf40d7defcdcbc3dea988d26c3c06a (commit) via 7f9a2c4f24b5b90be7fa1c1df175c692e4630516 (commit) via 5533c6ff5ee018fcaca7203a394e3b864e09b4ad (commit) via d829caee965825b52c3c67dacc203de2810cf4f5 (commit) via 93405a7c6e57b2f0cd6e77b30116504e1919e30d (commit) via a5a347aa28014f2cbe26a4983fe8ac30526d6d72 (commit) from e98b6ab7e69a1328b2e99462d9414cdf0781220f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 06bb113b77f338d529b929cb08c463ad459ff19a Author: Lawrence Sebald <ljs...@us...> Date: Sat Jul 18 21:31:04 2020 -0400 Clean up formatting, rename BFONT_VICON_* -> BFONT_ICON_*, and fix NAOMI compilation of the vmu.c file. commit 938f6f8fee6b671465519e3081d91c49c47d3345 Merge: e98b6ab 0dc4dd5 Author: Lawrence Sebald <ljs...@us...> Date: Sat Jul 18 21:18:56 2020 -0400 Merge pull request #42 from andressbarajas/vmu_icons Added vmu functionality commit 0dc4dd5a038eb04c664b40d6658c6a84edd6bade Author: Andress Barajas <and...@gm...> Date: Fri Jul 17 22:31:28 2020 -0700 Preface with BFONT commit 384139ad5acf40d7defcdcbc3dea988d26c3c06a Merge: 7f9a2c4 e98b6ab Author: Andress Barajas <and...@gm...> Date: Mon Jul 6 22:58:18 2020 -0700 Merge remote-tracking branch 'upstream/master' into vmu_icons Get latest KOS Fat fixes commit 7f9a2c4f24b5b90be7fa1c1df175c692e4630516 Author: Andress Barajas <and...@gm...> Date: Sat Jul 4 01:40:34 2020 -0700 Use already existing vmu root functions commit 5533c6ff5ee018fcaca7203a394e3b864e09b4ad Author: Andress Barajas <and...@gm...> Date: Thu Jul 2 17:03:03 2020 -0700 Fix comment for vmu_set_custom_color() commit d829caee965825b52c3c67dacc203de2810cf4f5 Author: Andress Barajas <and...@gm...> Date: Thu Jul 2 10:34:47 2020 -0700 Added more clarification about icon data commit 93405a7c6e57b2f0cd6e77b30116504e1919e30d Author: Andress Barajas <and...@gm...> Date: Thu Jul 2 07:49:44 2020 -0700 Remove unneeded string.h commit a5a347aa28014f2cbe26a4983fe8ac30526d6d72 Author: Andress Barajas <and...@gm...> Date: Thu Jul 2 02:25:37 2020 -0700 Added vmu functionality ----------------------------------------------------------------------- Summary of changes: kernel/arch/dreamcast/hardware/biosfont.c | 65 ++++---- kernel/arch/dreamcast/hardware/maple/vmu.c | 111 ++++++++++++-- kernel/arch/dreamcast/include/dc/biosfont.h | 215 +++++++++++++++++++++++---- kernel/arch/dreamcast/include/dc/maple/vmu.h | 58 ++++++++ 4 files changed, 373 insertions(+), 76 deletions(-) diff --git a/kernel/arch/dreamcast/hardware/biosfont.c b/kernel/arch/dreamcast/hardware/biosfont.c index 8536b99..586fa17 100644 --- a/kernel/arch/dreamcast/hardware/biosfont.c +++ b/kernel/arch/dreamcast/hardware/biosfont.c @@ -42,10 +42,10 @@ static int bfont_32bit = 0; /* Select an encoding for Japanese (or disable) */ void bfont_set_encoding(uint8 enc) { - if(enc <= BFONT_CODE_RAW) + if(enc <= BFONT_CODE_RAW) bfont_code_mode = enc; else - assert_msg(0, "Unknown bfont encoding mode"); + assert_msg(0, "Unknown bfont encoding mode"); } /* Set the foreground color and return the old color */ @@ -62,8 +62,8 @@ uint32 bfont_set_background_color(uint32 c) { return rv; } -/* Set the font to draw in 32 or 16 bit mode. - Deprecated: This will only impact compat functions for now. +/* Set the font to draw in 32 or 16 bit mode. + Deprecated: This will only impact compat functions for now. Moving forward, the compat will be 16bit only. */ int bfont_set_32bit_mode(int on) { int rv = bfont_32bit; @@ -173,7 +173,7 @@ uint16 *bfont_draw_one_row(uint16 *b, uint16 word, uint8 opaque, uint32 fg, uint uint8 x; uint32 color = 0x0000; uint16 write16 = 0x0000; - uint16 oldcolor = *b; + uint16 oldcolor = *b; if ((bpp == 4)||(bpp == 8)) { /* For 4 or 8bpp we have to go 2 or 4 pixels at a time to properly write out in all cases. */ @@ -184,17 +184,17 @@ uint16 *bfont_draw_one_row(uint16 *b, uint16 word, uint8 opaque, uint32 fg, uint oldcolor = *b; write16 = 0x0000; } - + if(word & (0x0800 >> x)) write16 |= fg<<(bpp*(x%pix)); else { if(opaque) write16 |= bg<<(bpp*(x%pix)); else write16 |= oldcolor&(bMask<<(bpp*(x%pix))); } if(x%pix == (pix-1)) *b++ = write16; - } + } } - else {/* 16 or 32 */ - + else {/* 16 or 32 */ + for(x = 0; x < BFONT_THIN_WIDTH; x++, b++) { if(word & (0x0800 >> x)) color = fg; @@ -202,11 +202,11 @@ uint16 *bfont_draw_one_row(uint16 *b, uint16 word, uint8 opaque, uint32 fg, uint if(opaque) color = bg; else continue; } - if(bpp==16) *b = color & 0xffff; + if(bpp==16) *b = color & 0xffff; else if(bpp == 32) {*(uint32 *)b = color; b++;} } } - + return b; } @@ -214,23 +214,23 @@ unsigned char bfont_draw_ex(uint8 *buffer, uint32 bufwidth, uint32 fg, uint32 bg uint8 *ch; uint16 word; uint8 y; - + /* If they're requesting a wide char and in the wrong format, kick this out */ if (wide && (bfont_code_mode == BFONT_CODE_ISO8859_1)) { dbglog(DBG_ERROR, "bfont_draw_ex: can't draw wide in bfont mode %d\n", bfont_code_mode); return 0; } - + /* Just making sure we can draw the character we want to */ if (bufwidth < (uint32)(BFONT_THIN_WIDTH*(wide+1))) { dbglog(DBG_ERROR, "bfont_draw_ex: buffer is too small to draw into\n"); return 0; - } - + } + /* Translate the character */ if (bfont_code_mode == BFONT_CODE_RAW) ch = get_font_address() + c; - else if (wide && ((bfont_code_mode == BFONT_CODE_EUC) || (bfont_code_mode == BFONT_CODE_SJIS))) + else if (wide && ((bfont_code_mode == BFONT_CODE_EUC) || (bfont_code_mode == BFONT_CODE_SJIS))) ch = bfont_find_char_jp(c); else { if(iskana) @@ -238,26 +238,26 @@ unsigned char bfont_draw_ex(uint8 *buffer, uint32 bufwidth, uint32 fg, uint32 bg else ch = bfont_find_char(c); } - + /* Increment over the height of the font. 3bytes at a time (2 thin or 1 wide row) */ for(y = 0; y < BFONT_HEIGHT; y+= (2-wide),ch+=((BFONT_THIN_WIDTH*2)/8)) { /* Do the first row, or half row */ word = (((uint16)ch[0]) << 4) | ((ch[1] >> 4) & 0x0f); buffer = (uint8*)bfont_draw_one_row((uint16*)buffer, word, opaque, fg, bg, bpp); - + /* If we're thin, increment to next row, otherwise continue the row */ if(!wide) buffer += ((bufwidth - BFONT_THIN_WIDTH)*bpp)/8; - + /* Do the second row, or second half */ word = ((((uint16)ch[1]) << 8) & 0xf00) | ch[2]; buffer = (uint8*)bfont_draw_one_row((uint16*)buffer, word, opaque, fg, bg, bpp); - + /* Increment to the next row. */ if(!wide) buffer += ((bufwidth - BFONT_THIN_WIDTH)*bpp)/8; - else buffer += ((bufwidth - BFONT_WIDE_WIDTH)*bpp)/8; + else buffer += ((bufwidth - BFONT_WIDE_WIDTH)*bpp)/8; } - + /* Return the horizontal distance covered in bytes */ if (wide) return (BFONT_WIDE_WIDTH*bpp)/8; @@ -266,7 +266,7 @@ unsigned char bfont_draw_ex(uint8 *buffer, uint32 bufwidth, uint32 fg, uint32 bg } /* Draw half-width kana */ -unsigned char bfont_draw_thin(void *b, uint32 bufwidth, uint8 opaque, uint32 c, uint8 iskana) { +unsigned char bfont_draw_thin(void *b, uint32 bufwidth, uint8 opaque, uint32 c, uint8 iskana) { return bfont_draw_ex((uint8 *)b, bufwidth, bfont_fgcolor, bfont_bgcolor, (bfont_32bit ? (sizeof (uint32)) : (sizeof (uint16))) << 3, opaque, c, 0, iskana); } @@ -282,12 +282,12 @@ unsigned char bfont_draw_wide(void *b, uint32 bufwidth, uint8 opaque, uint32 c) /* Draw string of full-width (wide) and half-width (thin) characters Note that this handles the case of mixed encodings unless Japanese - support is disabled (BFONT_CODE_ISO8859_1). - XXX: Seems like this can be shrunk to use uint8 for nChr/Mask/Flag and + support is disabled (BFONT_CODE_ISO8859_1). + XXX: Seems like this can be shrunk to use uint8 for nChr/Mask/Flag and getting rid of nMask. */ void bfont_draw_str_ex(void *b, uint32 width, uint32 fg, uint32 bg, uint8 bpp, uint8 opaque, char *str) { - uint16 nChr, nMask, nFlag; + uint16 nChr, nMask, nFlag; uint8 *buffer = (uint8 *)b; while(*str) { @@ -325,10 +325,10 @@ void bfont_draw_str_ex(void *b, uint32 width, uint32 fg, uint32 bg, uint8 bpp, u nChr = (nChr << 8) | (*str & 0xff); buffer += bfont_draw_ex(buffer, width, fg, bg, bpp, opaque, nChr, 1, 0); } - else + else buffer += bfont_draw_ex(buffer, width, fg, bg, bpp, opaque, nChr, 0, 1); } - else + else buffer += bfont_draw_ex(buffer, width, fg, bg, bpp, opaque, nChr, 0, 0); str++; @@ -339,3 +339,12 @@ void bfont_draw_str(void *b, uint32 width, uint8 opaque, char *str) { bfont_draw_str_ex(b, width, bfont_fgcolor, bfont_bgcolor, (bfont_32bit ? (sizeof (uint32)) : (sizeof (uint16))) << 3, opaque, str); } +uint8 *bfont_find_icon(uint8 icon) { + if(icon > BFONT_ICON_EMBROIDERY) + return NULL; + + int icon_offset = BFONT_VMU_DREAMCAST_SPECIFIC + + (icon * BFONT_ICON_DIMEN * BFONT_ICON_DIMEN/8); + uint8 *fa = get_font_address(); + return fa + icon_offset; +} diff --git a/kernel/arch/dreamcast/hardware/maple/vmu.c b/kernel/arch/dreamcast/hardware/maple/vmu.c index c916ab7..0089c3b 100644 --- a/kernel/arch/dreamcast/hardware/maple/vmu.c +++ b/kernel/arch/dreamcast/hardware/maple/vmu.c @@ -12,6 +12,8 @@ #include <kos/genwait.h> #include <dc/maple.h> #include <dc/maple/vmu.h> +#include <dc/biosfont.h> +#include <dc/vmufs.h> #include <arch/timer.h> /* @@ -45,6 +47,71 @@ void vmu_shutdown() { maple_driver_unreg(&vmu_drv); } +int vmu_use_custom_color(maple_device_t * dev, int enable) { + vmu_root_t root; + + if(vmufs_root_read(dev, &root) < 0) + return -1; + + /* 1 - Enables the use of the custom color. 0 - Disables */ + root.use_custom = (enable != 0) ? 1 : 0; + + if(vmufs_root_write(dev, &root) < 0) + return -1; + + return 0; +} + +/* The custom color is used while navigating the Dreamcast's file manager. + You set the RGBA parameters, each with valid range of 0-255 */ +int vmu_set_custom_color(maple_device_t * dev, uint8 red, uint8 green, uint8 blue, uint8 alpha) { + vmu_root_t root; + + if(vmufs_root_read(dev, &root) < 0) + return -1; + + /* 1 - Enables the use of the custom color. 0 - Disables */ + root.use_custom = 1; + root.custom_color[0] = blue; + root.custom_color[1] = green; + root.custom_color[2] = red; + root.custom_color[3] = alpha; + + if(vmufs_root_write(dev, &root) < 0) + return -1; + + return 0; +} + +/* The icon shape is used while navigating the BIOS menu. The values + for icon_shape are listed in the biosfont.h and start with + BFONT_ICON_VMUICON. */ +int vmu_set_icon_shape(maple_device_t * dev, uint8 icon_shape) { +#ifdef _arch_sub_naomi + vmu_root_t root; + + if(icon_shape < BFONT_ICON_VMUICON || icon_shape > BFONT_ICON_EMBROIDERY) + return -1; + + if(vmufs_root_read(dev, &root) < 0) + return -1; + + /* Valid value range is 0-123 and starts with BFONT_ICON_VMUICON which + has a value of 5. This is because we cant use the first 5 icons + found in the bios so we must subtract 5 */ + root.icon_shape = icon_shape - BFONT_ICON_VMUICON; + + if(vmufs_root_write(dev, &root) < 0) + return -1; + + return 0; +#else + (void)dev; + (void)icon_shape; + return -1; +#endif +} + /* These interfaces will probably change eventually, but for now they can stay the same */ @@ -137,6 +204,31 @@ int vmu_draw_lcd(maple_device_t * dev, void *bitmap) { return MAPLE_EOK; } +/* This function converts a xbm image to a 1-bit bitmap that can + be displayed on LCD screen of VMU */ +static void vmu_xbm_to_bitmap(uint8 *bitmap, const char *vmu_icon) { + int x, y, xi, xb; + memset(bitmap, 0, 48 * 32 / 8); + + if(vmu_icon) { + for(y = 0; y < 32; y++) + for(x = 0; x < 48; x++) { + xi = x / 8; + xb = 0x80 >> (x % 8); + + if(vmu_icon[(31 - y) * 48 + (47 - x)] == '.') + bitmap[y * (48 / 8) + xi] |= xb; + } + } +} + +int vmu_draw_lcd_xbm(maple_device_t * dev, const char *vmu_icon) { + uint8 bitmap[48 * 32 / 8]; + vmu_xbm_to_bitmap(bitmap, vmu_icon); + + return vmu_draw_lcd(dev, bitmap); +} + /* Read the data in block blocknum into buffer, return a -1 if an error occurs, for now we ignore MAPLE_RESPONSE_FILEERR, which will be changed shortly */ @@ -349,24 +441,11 @@ int vmu_block_write(maple_device_t * dev, uint16 blocknum, uint8 *buffer) { /* Utility function which sets the icon on all available VMUs from an Xwindows XBM. Imported from libdcutils. */ void vmu_set_icon(const char *vmu_icon) { - int x, y, xi, xb, i; - uint8 bitmap[48 * 32 / 8]; + int i = 0; maple_device_t * dev; + uint8 bitmap[48 * 32 / 8]; - memset(bitmap, 0, 48 * 32 / 8); - - if(vmu_icon) { - for(y = 0; y < 32; y++) - for(x = 0; x < 48; x++) { - xi = x / 8; - xb = 0x80 >> (x % 8); - - if(vmu_icon[(31 - y) * 48 + (47 - x)] == '.') - bitmap[y * (48 / 8) + xi] |= xb; - } - } - - i = 0; + vmu_xbm_to_bitmap(bitmap, vmu_icon); while((dev = maple_enum_type(i++, MAPLE_FUNC_LCD))) { vmu_draw_lcd(dev, bitmap); diff --git a/kernel/arch/dreamcast/include/dc/biosfont.h b/kernel/arch/dreamcast/include/dc/biosfont.h index 65cb10c..549dbe7 100644 --- a/kernel/arch/dreamcast/include/dc/biosfont.h +++ b/kernel/arch/dreamcast/include/dc/biosfont.h @@ -36,16 +36,16 @@ __BEGIN_DECLS /** @} */ #define JISX_0208_ROW_SIZE 94 -/** \defgroup bfont_indecies Structure of the Bios Font +/** \defgroup bfont_indecies Structure of the Bios Font @{ */ #define BFONT_NARROW_START 0 /**< \brief Start of Narrow Characters in Font Block */ -#define BFONT_OVERBAR BFONT_NARROW_START -#define BFONT_ISO_8859_1_33_126 BFONT_NARROW_START+( 1*BFONT_THIN_WIDTH*BFONT_HEIGHT/8) -#define BFONT_YEN BFONT_NARROW_START+(95*BFONT_THIN_WIDTH*BFONT_HEIGHT/8) -#define BFONT_ISO_8859_1_160_255 BFONT_NARROW_START+(96*BFONT_THIN_WIDTH*BFONT_HEIGHT/8) +#define BFONT_OVERBAR BFONT_NARROW_START +#define BFONT_ISO_8859_1_33_126 BFONT_NARROW_START+( 1*BFONT_THIN_WIDTH*BFONT_HEIGHT/8) +#define BFONT_YEN BFONT_NARROW_START+(95*BFONT_THIN_WIDTH*BFONT_HEIGHT/8) +#define BFONT_ISO_8859_1_160_255 BFONT_NARROW_START+(96*BFONT_THIN_WIDTH*BFONT_HEIGHT/8) -/* JISX-0208 Rows 1-7 and 16-84 are encoded between BFONT_WIDE_START and BFONT_DREAMCAST_SPECIFIC. +/* JISX-0208 Rows 1-7 and 16-84 are encoded between BFONT_WIDE_START and BFONT_DREAMCAST_SPECIFIC. Only the box-drawing characters (row 8) are missing. */ #define BFONT_WIDE_START (288*BFONT_THIN_WIDTH*BFONT_HEIGHT/8) /**< \brief Start of Wide Characters in Font Block */ #define BFONT_JISX_0208_ROW1 BFONT_WIDE_START /**< \brief Start of JISX-0208 Rows 1-7 in Font Block */ @@ -77,7 +77,138 @@ __BEGIN_DECLS #define BFONT_STARTBUTTON BFONT_DREAMCAST_SPECIFIC+(20*BFONT_WIDE_WIDTH*BFONT_HEIGHT/8) #define BFONT_VMUICON BFONT_DREAMCAST_SPECIFIC+(21*BFONT_WIDE_WIDTH*BFONT_HEIGHT/8) - +#define BFONT_ICON_DIMEN 32 /**< \brief Dimension of vmu icons */ +#define BFONT_VMU_DREAMCAST_SPECIFIC BFONT_DREAMCAST_SPECIFIC+(22*BFONT_WIDE_WIDTH*BFONT_HEIGHT/8) + +#define BFONT_ICON_INVALID_VMU 0x00 +#define BFONT_ICON_HOURGLASS_ONE 0x01 +#define BFONT_ICON_HOURGLASS_TWO 0x02 +#define BFONT_ICON_HOURGLASS_THREE 0x03 +#define BFONT_ICON_HOURGLASS_FOUR 0x04 +#define BFONT_ICON_VMUICON 0x05 +#define BFONT_ICON_EARTH 0x06 +#define BFONT_ICON_SATURN 0x07 +#define BFONT_ICON_QUARTER_MOON 0x08 +#define BFONT_ICON_LAUGHING_FACE 0x09 +#define BFONT_ICON_SMILING_FACE 0x0A +#define BFONT_ICON_CASUAL_FACE 0x0B +#define BFONT_ICON_ANGRY_FACE 0x0C +#define BFONT_ICON_COW 0x0D +#define BFONT_ICON_HORSE 0x0E +#define BFONT_ICON_RABBIT 0x0F +#define BFONT_ICON_CAT 0x10 +#define BFONT_ICON_CHICK 0x11 +#define BFONT_ICON_LION 0x12 +#define BFONT_ICON_MONKEY 0x13 +#define BFONT_ICON_PANDA 0x14 +#define BFONT_ICON_BEAR 0x15 +#define BFONT_ICON_PIG 0x16 +#define BFONT_ICON_DOG 0x17 +#define BFONT_ICON_FISH 0x18 +#define BFONT_ICON_OCTOPUS 0x19 +#define BFONT_ICON_SQUID 0x1A +#define BFONT_ICON_WHALE 0x1B +#define BFONT_ICON_CRAB 0x1C +#define BFONT_ICON_BUTTERFLY 0x1D +#define BFONT_ICON_LADYBUG 0x1E +#define BFONT_ICON_ANGLER_FISH 0x1F +#define BFONT_ICON_PENGUIN 0x20 +#define BFONT_ICON_CHERRIES 0x21 +#define BFONT_ICON_TULIP 0x22 +#define BFONT_ICON_LEAF 0x23 +#define BFONT_ICON_SAKURA 0x24 +#define BFONT_ICON_APPLE 0x25 +#define BFONT_ICON_ICECREAM 0x26 +#define BFONT_ICON_CACTUS 0x27 +#define BFONT_ICON_PIANO 0x28 +#define BFONT_ICON_GUITAR 0x29 +#define BFONT_ICON_EIGHTH_NOTE 0x2A +#define BFONT_ICON_TREBLE_CLEF 0x2B +#define BFONT_ICON_BOAT 0x2C +#define BFONT_ICON_CAR 0x2D +#define BFONT_ICON_HELMET 0x2E +#define BFONT_ICON_MOTORCYCLE 0x2F +#define BFONT_ICON_VAN 0x30 +#define BFONT_ICON_TRUCK 0x31 +#define BFONT_ICON_CLOCK 0x32 +#define BFONT_ICON_TELEPHONE 0x33 +#define BFONT_ICON_PENCIL 0x34 +#define BFONT_ICON_CUP 0x35 +#define BFONT_ICON_SILVERWARE 0x36 +#define BFONT_ICON_HOUSE 0x37 +#define BFONT_ICON_BELL 0x38 +#define BFONT_ICON_CROWN 0x39 +#define BFONT_ICON_SOCK 0x3A +#define BFONT_ICON_CAKE 0x3B +#define BFONT_ICON_KEY 0x3C +#define BFONT_ICON_BOOK 0x3D +#define BFONT_ICON_BASEBALL 0x3E +#define BFONT_ICON_SOCCER 0x3F +#define BFONT_ICON_BULB 0x40 +#define BFONT_ICON_TEDDY_BEAR 0x41 +#define BFONT_ICON_BOW_TIE 0x42 +#define BFONT_ICON_BOW_ARROW 0x43 +#define BFONT_ICON_SNOWMAN 0x44 +#define BFONT_ICON_LIGHTNING 0x45 +#define BFONT_ICON_SUN 0x46 +#define BFONT_ICON_CLOUD 0x47 +#define BFONT_ICON_UMBRELLA 0x48 +#define BFONT_ICON_ONE_STAR 0x49 +#define BFONT_ICON_TWO_STARS 0x4A +#define BFONT_ICON_THREE_STARS 0x4B +#define BFONT_ICON_FOUR_STARS 0x4C +#define BFONT_ICON_HEART 0x4D +#define BFONT_ICON_DIAMOND 0x4E +#define BFONT_ICON_SPADE 0x4F +#define BFONT_ICON_CLUB 0x50 +#define BFONT_ICON_JACK 0x51 +#define BFONT_ICON_QUEEN 0x52 +#define BFONT_ICON_KING 0x53 +#define BFONT_ICON_JOKER 0x54 +#define BFONT_ICON_ISLAND 0x55 +#define BFONT_ICON_0 0x56 +#define BFONT_ICON_1 0x57 +#define BFONT_ICON_2 0x58 +#define BFONT_ICON_3 0x59 +#define BFONT_ICON_4 0x5A +#define BFONT_ICON_5 0x5B +#define BFONT_ICON_6 0x5C +#define BFONT_ICON_7 0x5D +#define BFONT_ICON_8 0x5E +#define BFONT_ICON_9 0x5F +#define BFONT_ICON_A 0x60 +#define BFONT_ICON_B 0x61 +#define BFONT_ICON_C 0x62 +#define BFONT_ICON_D 0x63 +#define BFONT_ICON_E 0x64 +#define BFONT_ICON_F 0x65 +#define BFONT_ICON_G 0x66 +#define BFONT_ICON_H 0x67 +#define BFONT_ICON_I 0x68 +#define BFONT_ICON_J 0x69 +#define BFONT_ICON_K 0x6A +#define BFONT_ICON_L 0x6B +#define BFONT_ICON_M 0x6C +#define BFONT_ICON_N 0x6D +#define BFONT_ICON_O 0x6E +#define BFONT_ICON_P 0x6F +#define BFONT_ICON_Q 0x70 +#define BFONT_ICON_R 0x71 +#define BFONT_ICON_S 0x72 +#define BFONT_ICON_T 0x73 +#define BFONT_ICON_U 0x74 +#define BFONT_ICON_V 0x75 +#define BFONT_ICON_W 0x76 +#define BFONT_ICON_X 0x77 +#define BFONT_ICON_Y 0x78 +#define BFONT_ICON_Z 0x79 +#define BFONT_ICON_CHECKER_BOARD 0x7A +#define BFONT_ICON_GRID 0x7B +#define BFONT_ICON_LIGHT_GRAY 0x7C +#define BFONT_ICON_DIAG_GRID 0x7D +#define BFONT_ICON_PACMAN_GRID 0x7E +#define BFONT_ICON_DARK_GRAY 0x7F +#define BFONT_ICON_EMBROIDERY 0x80 /** @} */ @@ -111,7 +242,8 @@ uint32 bfont_set_background_color(uint32 c); \param on Set to 0 to use 16-bit color, 32-bit otherwise. \return The old state (1 = 32-bit, 0 = 16-bit). */ -int bfont_set_32bit_mode(int on) __depr("Please use the bpp function of the the bfont_draw_ex functions"); +int bfont_set_32bit_mode(int on) + __depr("Please use the bpp function of the the bfont_draw_ex functions"); ...<truncated>... hooks/post-receive -- A pseudo Operating System for the Dreamcast. |