Rockbox

This is the bug/patch tracker for Rockbox. Click here for more information.

Quick links: Bugs · Patches · Rockbox frontpage

Tasklist

FS#5901 - Multiple user fonts for using in WPS

Attached to Project: Rockbox
Opened by P.I.Julius (pijulius) - Tuesday, 29 August 2006, 17:58 GMT+1
Task Type Patches
Category WPS
Status Closed
Assigned To No-one
Player Type iPod 5G
Severity Low
Priority Normal
Reported Version
Due in Version Undecided
Due Date Undecided
Percent Complete 0%
Private No

Details

This patch adds 7 user fonts to the multifont.patch so you can use them in your wps by using the customline.patch
The lines in the wps.cfg look like these:
userfont1: /.rockbox/fonts/helvR10.fnt
userfont2: /.rockbox/fonts/helvR12.fnt
userfont3: /.rockbox/fonts/helvR14.fnt
userfont4: /.rockbox/fonts/helvR18.fnt
...
and so on

And now you can use these fonts in your wps by specifying the font by it's number:
%e|11|219|30|1|B8C8E1|%alMusic
where 1 = userfont1

NOTE1: This patch depends on the multifont.patch which is not updated to the latest cvs, so I attached the syncronized one too.

Best,
Julius
   multifont-userfonts-20060828.patch (14.4 KiB)
 apps/filetree.c        |   22 ++++++
 apps/settings.c        |  172 +++++++++++++++++++++++++++++++++++++++++++++++++
 apps/settings.h        |    7 +
 build                  |only
 firmware/export/font.h |   16 ++++
 firmware/font.c        |   58 ++++++++++++++++
 6 files changed, 273 insertions(+), 2 deletions(-)

   multifont-20060828.patch (70.2 KiB)
 apps/eq_menu.c                     |    1 
 apps/filetree.c                    |   21 +
 apps/gui/buttonbar.c               |    2 
 apps/gui/gwps-common.c             |    3 
 apps/gui/gwps.c                    |   11 +
 apps/gui/list.c                    |   19 +
 apps/gui/list.h                    |    7 
 apps/gui/quickscreen.c             |    1 
 apps/gui/statusbar.c               |    6 
 apps/menu.c                        |    6 
 apps/plugins/bounce.c              |    2 
 apps/plugins/brickmania.c          |    2 
 apps/plugins/bubbles.c             |    4 
 apps/plugins/chessbox/chessbox.c   |    3 
 apps/plugins/credits.c             |    2 
 apps/plugins/databox/databox.c     |    4 
 apps/plugins/doom/rockdoom.c       |    2 
 apps/plugins/jewels.c              |    4 
 apps/plugins/jpeg.c                |    2 
 apps/plugins/mp3_encoder.c         |    2 
 apps/plugins/rockpaint.c           |   14 -
 apps/plugins/spacerocks.c          |    2 
 apps/plugins/stopwatch.c           |    2 
 apps/plugins/tetrox.c              |    2 
 apps/plugins/viewer.c              |    2 
 apps/plugins/xobox.c               |    4 
 apps/recorder/keyboard.c           |   14 -
 apps/recorder/peakmeter.c          |    2 
 apps/recorder/radio.c              |    5 
 apps/recorder/recording.c          |    9 
 apps/screen_access.c               |    2 
 apps/screens.c                     |    1 
 apps/settings.c                    |  157 ++++++++++++--
 apps/settings.h                    |   12 +
 apps/sound_menu.c                  |    1 
 apps/tree.c                        |    4 
 firmware/drivers/lcd-16bit.c       |    4 
 firmware/drivers/lcd-2bit-horz.c   |    4 
 firmware/drivers/lcd-h100-remote.c |    4 
 firmware/drivers/lcd-h100.c        |    4 
 firmware/export/font.h             |   41 ++-
 firmware/font.c                    |  405 ++++++++++++++++++++++---------------
 firmware/font_cache.c              |   11 -
 firmware/include/font_cache.h      |   21 +
 firmware/include/lru.h             |    2 
 firmware/lru.c                     |    4 
 firmware/powermgmt.c               |    7 
 tools/convbdf.c                    |    2 
 48 files changed, 575 insertions(+), 271 deletions(-)

This task depends upon

Closed by  Rani Hod (RaeNye)
Monday, 18 September 2006, 19:07 GMT+1
Reason for closing:  Duplicate
Additional comments about closing:  dup of  FS#4733 
Comment by Paul Louden (darkkone) - Tuesday, 29 August 2006, 20:40 GMT+1
Out of curiosity, why didn't you attach the updated multifont to the multifont patch tracker entry, where it belongs?
Comment by P.I.Julius (pijulius) - Tuesday, 29 August 2006, 20:58 GMT+1
To tell you the truth I have no idea :) but I'm pretty sure it was because I'm to tired and I totally forgot it, but anyway, thanks for the notification, I added there too now.
Comment by Kyle P. Vincent (KyleV) - Thursday, 31 August 2006, 06:50 GMT+1
Sadly, CVS always keeps on updating.
The updated-to-CVS multifont-20060828.patch is out of date again.

But, nice new line up of WPS related patches.
Comment by Kyle P. Vincent (KyleV) - Thursday, 31 August 2006, 06:56 GMT+1
Actually i don't think its out of date. :~(
Just checked 'patch --binary -p0 < custom_display_width.patch' and 'patch --binary -p0 < multifont-20060828.patch' (i applied them in that order), and it appears that the former causes a conflict with the latter, and therefore creates a reject file for the latter.
(Hope i wasn't confusing there.)
Comment by P.I.Julius (pijulius) - Thursday, 31 August 2006, 09:35 GMT+1
Yeah, it shouldn't be outdated, the only thing is that I didn't make the multifont.patch, multifont-userfonts.patch to depend on the custom_display_width.patch because these patches do a whole different thing, so they shouldn't depend on eachother.

Anyway, the problems is pretty easy to fix, just apply the rejected change manually, it should be only a few lines of code.

Loading...