1
0
Fork 0
forked from len0rd/rockbox
Commit graph

1512 commits

Author SHA1 Message Date
Dave Chapman
0bb2e05aef Stricter syntax checking of the %V tag - pay attention to the return-code from parse_list, and check for the tailing | symbol.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16784 a1c6a512-1295-4272-9138-f99709370657
2008-03-24 18:40:13 +00:00
Dave Chapman
2a34943d7f Hopefully get the viewport position/dimensions validation correct this time.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16782 a1c6a512-1295-4272-9138-f99709370657
2008-03-24 14:58:30 +00:00
Dave Chapman
6d9c353f2e Add another safety-check in the bitmap strips parsing - don't allow the num_subimages parameter to %xl to be <= 0
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16779 a1c6a512-1295-4272-9138-f99709370657
2008-03-24 10:13:47 +00:00
Dave Chapman
99c0978faa Add a sanity-check to ensure only in-range subimages are referenced in %xd tags. Plus some tab policing.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16774 a1c6a512-1295-4272-9138-f99709370657
2008-03-24 00:03:05 +00:00
Dave Chapman
15ddd7a7ec Add the ability to use bitmap strips (a single .bmp file containing many images of the same dimensions, tiled vertically - similar to icon strips) in the WPS. The %xl tag now has an optional "number of subimages" parameter, and the %xd tag has an optional "subimage to display" parameter (a-z,A-Z - allowing up to 52 sub-images). So for example, a bitmap with 10 subimages is loaded with %xl|M|volume.bmp|134|153|10| and then this can be used in a conditional as %?pv<%xdMa|%xdMb|%xdMc|%xdMd|%xdMe|%xdMf|%xdMg|%xdMh|%xdMi|%xdMj>.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16764 a1c6a512-1295-4272-9138-f99709370657
2008-03-23 20:31:00 +00:00
Dave Chapman
65d50de5b7 Oops - correctly reset the bmp filenames
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16762 a1c6a512-1295-4272-9138-f99709370657
2008-03-23 12:15:52 +00:00
Dave Chapman
bc227c0aa2 Fix the display of peakmeters and progress bars (without a custom y position) inside a viewport (broken by r16735).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16739 a1c6a512-1295-4272-9138-f99709370657
2008-03-22 10:56:03 +00:00
Dave Chapman
bca8edd856 Small simplification - take advantage of the fact that x/y/width/height are non-negative integers when validating the viewport bounds.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16736 a1c6a512-1295-4272-9138-f99709370657
2008-03-22 09:28:15 +00:00
Dave Chapman
45b2d8802d Reduce the shocking amount of RAM my viewports implementation was using. The first version stored an array of lines for each of the 16 possible viewports (MAX_VIEWPORTS * the number of lines on the LCD with a 5-pixel high font). This version reverts back to a single global array of lines, with each viewport specifying the first and last lines as indexes into that array. This also turns out to be simpler, reducing binsize a little as well.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16735 a1c6a512-1295-4272-9138-f99709370657
2008-03-22 00:31:22 +00:00
Dave Chapman
d02c79c03f Commit viewports-in-WPS patch (FS#8385). This adds the %V tag - see the CustomWPS page for details (shortly...). There is still some work to do - decide how to handle font references, decide how to handle conditionals. Plus checkwps is broken - I'll fix that in a separate commit.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16733 a1c6a512-1295-4272-9138-f99709370657
2008-03-21 19:38:00 +00:00
Dave Chapman
e92d2c51ed Add a general-purpose parse_list function to parse a string containing a delimited list of items and adapt the parse_image_load() function in the WPS parser to use it. This function will also be used to parse the upcoming WPS %V viewport tag, but I'm committing it separately as these changes are unrelated to the viewport implementation itself.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16728 a1c6a512-1295-4272-9138-f99709370657
2008-03-21 13:41:35 +00:00
Dave Chapman
2b7d48ede0 Bugfix for new list implementation - correctly assign colours for remote LCDs (fixes wrong colours on X5 remote)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16599 a1c6a512-1295-4272-9138-f99709370657
2008-03-09 23:53:46 +00:00
Jonathan Gordon
885283c424 more fixes for button bar... this will all disappear when viewports are handled by a manager of some sort
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16589 a1c6a512-1295-4272-9138-f99709370657
2008-03-09 09:37:39 +00:00
Jonathan Gordon
3f686d7034 fix recorder, buttonbar caused list problems
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16584 a1c6a512-1295-4272-9138-f99709370657
2008-03-09 02:00:31 +00:00
Jonathan Gordon
f444f1ecbe fix the touchpad list code
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16528 a1c6a512-1295-4272-9138-f99709370657
2008-03-05 10:38:10 +00:00
Jonathan Gordon
0e5cec2d18 FS#8457 - convert the list drawing code to use viewports. This does not include any of the customizability which was in the patch, so unless any bugs show up users should not notice any difference.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16527 a1c6a512-1295-4272-9138-f99709370657
2008-03-05 09:58:30 +00:00
Jens Arnold
bf9ae1f303 Fix the simplelist redraw behaviour. It caused e.g. the 'Open with...' menu items to not scroll as they should, making it partially unusable with small displays and/or large fonts. Thanks to JdGordon for pointing me into the right direction.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16415 a1c6a512-1295-4272-9138-f99709370657
2008-02-25 07:41:30 +00:00
Nicolas Pennequin
523f88e192 Hopefully fix FS#8459 by updating the WPS data when returning from the context menu.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16277 a1c6a512-1295-4272-9138-f99709370657
2008-02-10 23:07:01 +00:00
Paul Louden
f7c938a7b7 (Hopefully) Revert the quickscreen changes. Many fixes need to be made,
and the exact implementation needs discussion. We apologize for the 
inconvenience and hope to bring an improved quickscreen to you soon.



git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16224 a1c6a512-1295-4272-9138-f99709370657
2008-02-05 09:09:38 +00:00
Jonathan Gordon
7ca3ccd2a4 quiet the masses...
stop the wps scrolling happening in the quickscreen
green delta for non quickscreen targets
nfi why colours arnt working... hopefully bug in firmware/?


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16222 a1c6a512-1295-4272-9138-f99709370657
2008-02-05 08:21:54 +00:00
Jonathan Gordon
2c82494e66 updated the quickscreen's:
- use viewports
- dont change to system font, fiddle with item positions to make them fit small screens
- user customizable options (use the .cfg settings "quickscreen_left, quickscreen_right, quickscreen_top, quickscreen_bottom" for the name and the .cfg name for the setting you want to use. it can be any except the string settings... (e.g. quickscreen_left:talk menu)
- a top item! if there is none set the up button will exit the screen



git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16220 a1c6a512-1295-4272-9138-f99709370657
2008-02-05 05:50:20 +00:00
Peter D'Hoye
c4c678ff1a Accept FS #8490 by Vuong Minh Hiep: fix wrong selection in multi-line lists
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16135 a1c6a512-1295-4272-9138-f99709370657
2008-01-21 22:28:25 +00:00
Catalin Patulea
7ed787360c Fix compile error in wps_debug.c when -DDEBUG and not simulator build
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16084 a1c6a512-1295-4272-9138-f99709370657
2008-01-13 20:17:59 +00:00
Michael Sevakis
c4ebcbeaf4 Make set_option correctly return USB connect status.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16055 a1c6a512-1295-4272-9138-f99709370657
2008-01-11 17:43:07 +00:00
Jonathan Gordon
b684b82fd0 Accept and Fix FS#8427 - problem with empty screens in lists with pages scrolling enabled
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16023 a1c6a512-1295-4272-9138-f99709370657
2008-01-08 08:12:32 +00:00
Jonathan Gordon
213d9a2ca1 fix touchpad list code
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15948 a1c6a512-1295-4272-9138-f99709370657
2007-12-17 04:23:34 +00:00
Jonathan Gordon
f5ec3e49e0 remove the duplicated gui_list struct and only duplicate the members which are actually different on each screen. should translate to a smaller bin and easier code (users shouldnt notice any difference)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15947 a1c6a512-1295-4272-9138-f99709370657
2007-12-17 02:37:21 +00:00
Nicolas Pennequin
485bbbdb30 Make the "current line" value in the gradient style code zero-based, and an attempt at more understandable names and better comments.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15886 a1c6a512-1295-4272-9138-f99709370657
2007-12-06 17:09:24 +00:00
Jonathan Gordon
923cbe3224 revert my previous commit and use a conditional for the time format instead which is probably better.
%?cf<24 hour stuff|12 hour stuff>


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15830 a1c6a512-1295-4272-9138-f99709370657
2007-11-27 01:41:59 +00:00
Jonathan Gordon
0ade09bd6b add 2 new tags which display the hour in 12 or 24 hour format depending on the config setting.
%cf is for padded hour
%cg is for just the number


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15826 a1c6a512-1295-4272-9138-f99709370657
2007-11-27 01:18:31 +00:00
Jens Arnold
09a786138c Allow (almost) arbitrary backlight fade in and fade out times (on targets with software PWM fading), and comvert the associated settings to table settings. * Settings system: Unify a bunch of formatters and getlang helpers.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15817 a1c6a512-1295-4272-9138-f99709370657
2007-11-26 23:10:20 +00:00
Jens Arnold
e54244480d Convert 2 more settings to table settings. * Fix duplicate value display if the first value is selected in a table setting.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15805 a1c6a512-1295-4272-9138-f99709370657
2007-11-25 20:05:04 +00:00
Jens Arnold
d63f2375a2 Fix 64 bit warnings.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15804 a1c6a512-1295-4272-9138-f99709370657
2007-11-25 18:01:04 +00:00
Jens Arnold
d490f44112 New way of handling integer settings with variable steps: table settings (FS #8186, with fixes by me). This allows to get rid of those synchronised tables in firmware/ and apps/, making things more flexible and less error prone. First application: backlight timeouts. * Make some more things 'const'.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15803 a1c6a512-1295-4272-9138-f99709370657
2007-11-25 17:36:21 +00:00
Nils Wallménius
54ecc698a5 Break out some duplicated code into a seperate function
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15802 a1c6a512-1295-4272-9138-f99709370657
2007-11-25 14:07:40 +00:00
Jens Arnold
3082a40b0a Fix warnings.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15789 a1c6a512-1295-4272-9138-f99709370657
2007-11-24 11:30:11 +00:00
Jens Arnold
a9fa492dfb Make the sound settings talk unit selection slightly less hackish, and make it handle unitless settings (like the new bass/treble cutoff setting on iPod Video).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15788 a1c6a512-1295-4272-9138-f99709370657
2007-11-24 11:18:29 +00:00
Nils Wallménius
acbd780239 Make id's created with the TALK_ID macro work in 64 bit sims
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15723 a1c6a512-1295-4272-9138-f99709370657
2007-11-20 19:50:52 +00:00
Nicolas Pennequin
b766f11701 Oops, wrong define. Fixes the warnings.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15699 a1c6a512-1295-4272-9138-f99709370657
2007-11-19 18:25:13 +00:00
Nicolas Pennequin
1d86dbffe3 Accept FS#7901 by Akio Idehara: Fix gradient for scrolling lines when more than one line is selected
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15698 a1c6a512-1295-4272-9138-f99709370657
2007-11-19 18:14:51 +00:00
Linus Nielsen Feltzing
e75327b332 FS#7738 - Scroll wheel acceleration for iPod
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15681 a1c6a512-1295-4272-9138-f99709370657
2007-11-19 11:05:54 +00:00
Nicolas Pennequin
720cfe3954 Improve clearing of pictures in conditional constructs. This fixes improper clearing of pictures used in several conditionals or in nested conditionals (FS#7856).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15663 a1c6a512-1295-4272-9138-f99709370657
2007-11-18 15:32:45 +00:00
Nicolas Pennequin
572ecef486 Smarter conditional handling by storing the previous value. Updates are done only if the value has changed. This avoids unnecessary line or picture clearing, and should help fix some problems WPS creators were having.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15657 a1c6a512-1295-4272-9138-f99709370657
2007-11-18 13:24:39 +00:00
Nicolas Pennequin
83e190bcef Hopefully fix the compile errors.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15625 a1c6a512-1295-4272-9138-f99709370657
2007-11-14 22:18:51 +00:00
Nicolas Pennequin
31f76116f1 Make the WPS parser stricter with invalid parameter lists. It will now reject them instead of ignoring them (this includes the second parameter to %m|x|, which is invalid and now causes a failure). Also change the debugging code in order to allow more precise error messages, including the faulty token's index and description. Finally, add a few missing token description and fine-tune the #ifdefs.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15624 a1c6a512-1295-4272-9138-f99709370657
2007-11-14 22:02:41 +00:00
Nicolas Pennequin
f554e00b61 Allow setting a margin on a non-scrolling line by using %m|margin| instead of %s|margin|. This allows to easily place dynamic info next to album art.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15610 a1c6a512-1295-4272-9138-f99709370657
2007-11-14 00:45:04 +00:00
Nicolas Pennequin
bb999f9eb3 Check that the WPS uses album art before clearing its position on conditional. Without that check, having a conditional as very first token would cause undesired clearing. Thanks to PaulJam for spotting.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15609 a1c6a512-1295-4272-9138-f99709370657
2007-11-13 22:56:42 +00:00
Dave Chapman
f6ef46b73f FS#8135 - add an optional "left margin" parameter to the %s WPS tag - e.g. %s|100|. This patch uses parts of the scroll-margins patch (FS#2954), but is much smaller, only offers a left-margin, and only affects the WPS code.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15604 a1c6a512-1295-4272-9138-f99709370657
2007-11-12 21:34:01 +00:00
Nicolas Pennequin
8537cbf091 Add detection for a previously ignored error case: a conditional token is present but no conditional start token (e.g. "%?C%al|>"). This would cause an inifnite loop in the displaying code. Thanks to markun for making the mistake and reporting it ;)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15598 a1c6a512-1295-4272-9138-f99709370657
2007-11-12 18:43:38 +00:00
Nicolas Pennequin
81dedee7d0 Various album art improvements:
* Make the album art display tag static instead of dynamic, making it be drawn less often, which is good.
* Add the possibility of clearing the album art bitmap instead of drawing it, and use this abaility when the display tag is inside a conditional construct.
* Add the album art display tag to wps_debug.c.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15592 a1c6a512-1295-4272-9138-f99709370657
2007-11-12 01:31:42 +00:00