Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
24366 commits 17 branches 142 tags 291 MiB
Commit graph

179 commits

Author SHA1 Message Date
Jonathan Gordon
dafca1405e revert r25271 which caused more problems than it tried to fix 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25296 a1c6a512-1295-4272-9138-f99709370657
 2010-03-23 02:19:48 +00:00
Jonathan Gordon
4160fd91a7 there is a difference between viewports which shouldnt be cleared (the default viewport in the sbs) and viewports which should never be shown (%Vi viewport). so do this properly 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25271 a1c6a512-1295-4272-9138-f99709370657
 2010-03-21 13:27:55 +00:00
Jonathan Gordon
9c159c5d67 woops, elapsed is ms not HZ and how did that extra + get in there? 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25241 a1c6a512-1295-4272-9138-f99709370657
 2010-03-18 08:00:22 +00:00
Jonathan Gordon
e1fd5c2801 fix yelllow and add those tags to the debug output 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25240 a1c6a512-1295-4272-9138-f99709370657
 2010-03-18 07:20:14 +00:00
Jonathan Gordon
d2e2c2ad96 2 new tags: 
%pS - track is starting.
%pE - track is ending. both can optionally have a number straight after to change how long that tag should stay true for (e.g %pS10 will stay true for the first 10s of the track)


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25239 a1c6a512-1295-4272-9138-f99709370657
 2010-03-18 07:08:49 +00:00
Jonathan Gordon
d384f8d064 rearrange the skin loading to remove some code dupe 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25196 a1c6a512-1295-4272-9138-f99709370657
 2010-03-15 07:35:27 +00:00
Jonathan Gordon
1a8f29ca33 fix the remote font not working when there is no .rsbs loaded 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25195 a1c6a512-1295-4272-9138-f99709370657
 2010-03-15 07:12:33 +00:00
Jonathan Gordon
0f69a8152f fiddle with the skin debug output so the load lines arnt shown unless debugwps is enabled 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25162 a1c6a512-1295-4272-9138-f99709370657
 2010-03-14 11:32:03 +00:00
Jonathan Gordon
0376208a48 revert r25054 - tags which have an off and a list of option should have off as the first not last option. also fix it so the no icon position actually works. 
you can use %?Li<no|yes> if you want to.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25063 a1c6a512-1295-4272-9138-f99709370657
 2010-03-07 21:07:41 +00:00
Teruaki Kawashima
ce92b8bf34 Slightly change how %Li works when used as a conditional. last part is selected if and only if icon is not presented (i.e. is no icon) so that it can be used like true/false type conditional tag, e.g. "%?Li<Icon|No Icon>". 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25054 a1c6a512-1295-4272-9138-f99709370657
 2010-03-07 13:39:19 +00:00
Teruaki Kawashima
f50885534e Pass width instead of x+width to ab_draw_markers()/cue_draw_markers() and don't recalculate the width in these functions. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25053 a1c6a512-1295-4272-9138-f99709370657
 2010-03-07 12:51:23 +00:00
Teruaki Kawashima
1fbdd91333 skin: don't calculate id3->elapsed+state->ff_rewind_count each time. remove trailing spaces. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25045 a1c6a512-1295-4272-9138-f99709370657
 2010-03-06 14:14:44 +00:00
Jonathan Gordon
a9b5f4d810 cleanup statusbar+base skin relationship... 
* remove the "custom" option from the statusbar setting. if a sbs file is set then statusbar setting is ignored, no other user visible change there.
* new tag, %wi  - use to draw the inbuilt statusbar in the current viewport


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25038 a1c6a512-1295-4272-9138-f99709370657
 2010-03-06 00:29:46 +00:00
Jonathan Gordon
d9adfa1c73 FS#11072 - display the filename of the skin begin parsed in the debug output 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25003 a1c6a512-1295-4272-9138-f99709370657
 2010-03-03 08:30:31 +00:00
Jonathan Gordon
779d4e3ff7 remove some gremlins... viewport_set_*() sets the font to the UI font for that screen which is bad for the parser. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25002 a1c6a512-1295-4272-9138-f99709370657
 2010-03-03 05:57:15 +00:00
Jonathan Gordon
25d9771ebc make %Fl (font load) more consistant with bmp loading and require the whole filename, i.e require the .fnt. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25001 a1c6a512-1295-4272-9138-f99709370657
 2010-03-03 05:43:02 +00:00
Jonathan Gordon
e89f0dc8a6 Fix FS#11058 - conditionl viewports cause sublines to go a bit crazy 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24997 a1c6a512-1295-4272-9138-f99709370657
 2010-03-03 02:10:26 +00:00
Jonathan Gordon
6a6df5a1eb some small debug info fixes, add %Li and %lt and make uppercase subimage labels display correctly 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24996 a1c6a512-1295-4272-9138-f99709370657
 2010-03-03 01:38:25 +00:00
Jonathan Gordon
cc4363ad18 remove a nonsense outdate warning. there is no token limit anymore 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24995 a1c6a512-1295-4272-9138-f99709370657
 2010-03-03 00:54:41 +00:00
Jonathan Gordon
f37b5078f6 undo that last undo, make the font loader more forgiving to user errors 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24994 a1c6a512-1295-4272-9138-f99709370657
 2010-03-03 00:53:07 +00:00
Jonathan Gordon
9e611b1b00 revert r24989 ad r24990 which are cuasing segfaults... they were working fine for me though :( (stupid font stuff is cursed!) 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24993 a1c6a512-1295-4272-9138-f99709370657
 2010-03-02 21:47:35 +00:00
Jonathan Gordon
04e0d6c12c fix %pb when the height isnt given and it is in a viewport with a user font (so the height is calculated on the font height at display time) 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24991 a1c6a512-1295-4272-9138-f99709370657
 2010-03-02 08:47:45 +00:00
Jonathan Gordon
3f09d7eed1 fix red 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24990 a1c6a512-1295-4272-9138-f99709370657
 2010-03-02 08:32:55 +00:00
Jonathan Gordon
34f51ccb04 * Make the user font count more sane 
* font 2-9 in the skins will always be user fonts in the skins
* init the skinfonts array so it doesnt think id 'x' is used already
* make the parser work with FONT_UI untill the very end, even on remote fonts


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24989 a1c6a512-1295-4272-9138-f99709370657
 2010-03-02 08:24:50 +00:00
Thomas Martitz
3b52937c8a Revert r24958. It didn't fix anything (in fact, the problem described didn't exist). Increase MAXFONTS by 1 to allow for remote screen targets to load fonts 2-9. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24983 a1c6a512-1295-4272-9138-f99709370657
 2010-03-01 15:16:05 +00:00
Bertrik Sikken
7ab1cd7b1b Save some RAM by changing a char[] into a const char * in struct afmt_entry. Make other fields const too. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24970 a1c6a512-1295-4272-9138-f99709370657
 2010-02-28 14:13:35 +00:00
Jonathan Gordon
6434e760fc move a #ifdef so the full amount of user choosable skin fonts are avilable on non remote targets (i.e 2-9 inclusive) 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24958 a1c6a512-1295-4272-9138-f99709370657
 2010-02-28 08:48:04 +00:00
Jonathan Gordon
8717c1eaa1 redo r24943. the font mappings are not needed once the skin is finished parsing so using the skin buffer there is a waste and overcomplicates things. 
Also that commit breaks plain %pb so make sure you dont use %pb inside a viewport with a font number > 1


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24957 a1c6a512-1295-4272-9138-f99709370657
 2010-02-28 08:36:13 +00:00
Thomas Martitz
ea4eadc582 Add playlist viewer screen to %cs. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24953 a1c6a512-1295-4272-9138-f99709370657
 2010-02-27 21:24:50 +00:00
Nils Wallménius
722ae97836 Set missing svn properties 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24947 a1c6a512-1295-4272-9138-f99709370657
 2010-02-27 18:07:38 +00:00
Thomas Martitz
226308663f Store the list of fonts in a linked list instead of in a static array (together with the base filename) and load all fonts in a second step. This aids debugging missing fonts, skips fonts that are not used in viewports, and is preparation of a resizable (on boot) skin buffer. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24943 a1c6a512-1295-4272-9138-f99709370657
 2010-02-27 16:51:51 +00:00
Jonathan Gordon
466e5d9aa4 2 new tags for the base skin. 
%Lt - the title text for the current list
%Li - the icon number. Same order as the CustomIcons list, except the first icon is the "no icon" icon.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24917 a1c6a512-1295-4272-9138-f99709370657
 2010-02-26 03:45:41 +00:00
Jonathan Gordon
31fb4f6ff6 Change how touchscreen regions work slightly... "It modifies the behaviour of touch buttons to be more similar to the way gui buttons operate in desktop applications. Upon a touch press event, the button at the touch position is armed. Upon a touch repeat or release, the button at the touch position is triggered only if it is armed. Upon release (and wps entry), all buttons are disarmed. E.g. when you touch press on an empty area, then while pressing drag your finger on a button, then release the button, the button is not triggered." 
Author: Jens Theeß 
Flyspray: FS#10982


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24876 a1c6a512-1295-4272-9138-f99709370657
 2010-02-24 06:19:25 +00:00
Jonathan Gordon
6c4b80c67b make the parser spit out filenames of images it cant load 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24875 a1c6a512-1295-4272-9138-f99709370657
 2010-02-24 06:15:55 +00:00
Jonathan Gordon
0acb38b61c some minor changes to checkwps, shouldn't change anything 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24874 a1c6a512-1295-4272-9138-f99709370657
 2010-02-24 05:58:16 +00:00
Teruaki Kawashima
d151371836 correct checking size in function get_image_filename. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24844 a1c6a512-1295-4272-9138-f99709370657
 2010-02-22 06:00:49 +00:00
Thomas Martitz
a31624e76e Fix the mechanism to fail to parse skins if images fail to load and fix having no backdrop at all (neither %X nor backdrop setting, DancePuffDuo was broken). 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24814 a1c6a512-1295-4272-9138-f99709370657
 2010-02-21 19:29:33 +00:00
Jonathan Gordon
f85103e8f2 remote multifont fixes. it shoud be working again (blame AlexP! he made me break it last week!) 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24812 a1c6a512-1295-4272-9138-f99709370657
 2010-02-21 19:10:09 +00:00
Jonathan Gordon
eca85ac327 make sure font fd's get closed when a new skin is loaded 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24803 a1c6a512-1295-4272-9138-f99709370657
 2010-02-21 02:53:50 +00:00
Tomer Shalev
516d1264f8 WPS: Use helper local variable instead of its value (no functional change) 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24789 a1c6a512-1295-4272-9138-f99709370657
 2010-02-20 13:26:50 +00:00
Jonathan Gordon
ccd50dd2d7 and actually fix multifont on remote lcd targets also 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24780 a1c6a512-1295-4272-9138-f99709370657
 2010-02-19 23:54:36 +00:00
Jonathan Gordon
90d9e66920 fix possible out-of-bounds error on remote lcd targets if they try loading a font to id==2 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24779 a1c6a512-1295-4272-9138-f99709370657
 2010-02-19 23:49:17 +00:00
Jonathan Gordon
45a181d8fc allow integer sound settings (bass, volume, etc) to be used with conditional %St. "%?St|name|<min|min+1|...|max-1|max>" 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24745 a1c6a512-1295-4272-9138-f99709370657
 2010-02-18 07:04:16 +00:00
Jonathan Gordon
7dfd594cca fix yellow 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24741 a1c6a512-1295-4272-9138-f99709370657
 2010-02-18 02:37:58 +00:00
Jonathan Gordon
3cb735ef39 basic alignment support (%a|l|c|r|L|R) in the playlist viewer. no sublines so the whole line will either be left, right or centered. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24740 a1c6a512-1295-4272-9138-f99709370657
 2010-02-18 01:52:13 +00:00
Jonathan Gordon
f7ba156b27 change the %St tag so it only shows the filename of file settings, not the full path (i.e cabbiev2 instead of /.rockbox/wps/cabbiev2.wps) 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24717 a1c6a512-1295-4272-9138-f99709370657
 2010-02-17 07:17:06 +00:00
Teruaki Kawashima
d50c78c238 * surround member only used by charcells with #ifdef HAVE_LCD_CHARCELLS in struct scrollinfo in scroll_engine.h. 
* remove function prototypes which are not actualy defined.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24693 a1c6a512-1295-4272-9138-f99709370657
 2010-02-16 11:59:37 +00:00
Jonathan Gordon
877d378710 Reuse the backdrop buffers if 2 skins use the same backdrop (on the same screen of course) 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24690 a1c6a512-1295-4272-9138-f99709370657
 2010-02-16 05:24:27 +00:00
Jonathan Gordon
1c2aa35371 FS#10984 - multifont! 2 major additions: 
1) seperate UI font for the remote and main displays
2) allow individual skins to load additional fonts for use in the skin (Uo to 7 extra in this first version) see CustomWPS for info on how to load a font in the skins.

Code should always use FONT_UI+screen_number to get the correct user font


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24644 a1c6a512-1295-4272-9138-f99709370657
 2010-02-14 06:26:16 +00:00
Jonathan Gordon
7e6f124d4e revert r24478 and make the backdrop behaviour the same as it used to be (so when in the wps the sbs' backdrop will be fully disabled). Also changes the API back to having to manually set the current backdrop. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24565 a1c6a512-1295-4272-9138-f99709370657
 2010-02-08 09:38:03 +00:00