diff options
author | Bertrik Sikken <bertrik@sikken.nl> | 2009-01-31 12:23:35 +0000 |
---|---|---|
committer | Bertrik Sikken <bertrik@sikken.nl> | 2009-01-31 12:23:35 +0000 |
commit | 31c8eee99d7917bf83bbc6cf4cb9579af10d4d42 (patch) | |
tree | eb3720c5d04738af70ac29244c10deb677f4a217 | |
parent | ba4be5157191af6fbb83756119ffd29147b7fb99 (diff) | |
download | rockbox-31c8eee99d7917bf83bbc6cf4cb9579af10d4d42.tar.gz rockbox-31c8eee99d7917bf83bbc6cf4cb9579af10d4d42.zip |
FS#9763 - Sansa Clip modified WPS. This modified wps avoids wps elements getting split over the yellow/cyan
parts of the display. Also introduces a mechanism for selecting a target specific wps if there is already
another wps with the same screen size.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19889 a1c6a512-1295-4272-9138-f99709370657
-rwxr-xr-x | tools/buildzip.pl | 6 | ||||
-rw-r--r-- | tools/root.make | 14 | ||||
-rw-r--r-- | wps/cabbiev2.128x64x1.clip.wps | 35 | ||||
-rwxr-xr-x | wps/wpsbuild.pl | 6 |
4 files changed, 51 insertions, 10 deletions
diff --git a/tools/buildzip.pl b/tools/buildzip.pl index 85ffea58dd..7df6af3a36 100755 --- a/tools/buildzip.pl +++ b/tools/buildzip.pl | |||
@@ -24,7 +24,7 @@ my $verbose; | |||
24 | my $sim; | 24 | my $sim; |
25 | my $exe; | 25 | my $exe; |
26 | my $target; | 26 | my $target; |
27 | my $archos; | 27 | my $modelname; |
28 | my $incfonts; | 28 | my $incfonts; |
29 | my $target_id; # passed in, not currently used | 29 | my $target_id; # passed in, not currently used |
30 | my $rbdir=".rockbox"; # can be changed for special builds | 30 | my $rbdir=".rockbox"; # can be changed for special builds |
@@ -70,7 +70,7 @@ sub find_copyfile { | |||
70 | # Get options | 70 | # Get options |
71 | GetOptions ( 'r|root=s' => \$ROOT, | 71 | GetOptions ( 'r|root=s' => \$ROOT, |
72 | 'z|ziptool=s' => \$ziptool, | 72 | 'z|ziptool=s' => \$ziptool, |
73 | 't|target=s' => \$archos, # The target name as used in ARCHOS in the root makefile | 73 | 'm|modelname=s' => \$modelname, # The model name as used in ARCHOS in the root makefile |
74 | 'i|id=s' => \$target_id, # The target id name as used in TARGET_ID in the root makefile | 74 | 'i|id=s' => \$target_id, # The target id name as used in TARGET_ID in the root makefile |
75 | 'o|output=s' => \$output, | 75 | 'o|output=s' => \$output, |
76 | 'f|fonts=s' => \$incfonts, # 0 - no fonts, 1 - fonts only 2 - fonts and package | 76 | 'f|fonts=s' => \$incfonts, # 0 - no fonts, 1 - fonts only 2 - fonts and package |
@@ -389,7 +389,7 @@ STOP | |||
389 | if(-d "$ROOT/wps") { | 389 | if(-d "$ROOT/wps") { |
390 | my $wps_build_cmd="perl $ROOT/wps/wpsbuild.pl "; | 390 | my $wps_build_cmd="perl $ROOT/wps/wpsbuild.pl "; |
391 | $wps_build_cmd=$wps_build_cmd."-v " if $verbose; | 391 | $wps_build_cmd=$wps_build_cmd."-v " if $verbose; |
392 | $wps_build_cmd=$wps_build_cmd." --rbdir=$rbdir -r $ROOT $ROOT/wps/WPSLIST $target"; | 392 | $wps_build_cmd=$wps_build_cmd." --rbdir=$rbdir -r $ROOT -m $modelname $ROOT/wps/WPSLIST $target"; |
393 | print "wpsbuild: $wps_build_cmd\n" if $verbose; | 393 | print "wpsbuild: $wps_build_cmd\n" if $verbose; |
394 | system("$wps_build_cmd"); | 394 | system("$wps_build_cmd"); |
395 | print "wps_build_cmd: done\n" if $verbose; | 395 | print "wps_build_cmd: done\n" if $verbose; |
diff --git a/tools/root.make b/tools/root.make index 7de1cafc31..bdc2745fec 100644 --- a/tools/root.make +++ b/tools/root.make | |||
@@ -203,27 +203,27 @@ tags: | |||
203 | $(SILENT)etags -o $(BUILDDIR)/TAGS $(filter-out %.o,$(SRC) $(OTHER_SRC)) | 203 | $(SILENT)etags -o $(BUILDDIR)/TAGS $(filter-out %.o,$(SRC) $(OTHER_SRC)) |
204 | 204 | ||
205 | fontzip: | 205 | fontzip: |
206 | $(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -t \"$(MODELNAME)\" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 1 -o rockbox-fonts.zip $(TARGET) $(BINARY) | 206 | $(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -m \"$(MODELNAME)\" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 1 -o rockbox-fonts.zip $(TARGET) $(BINARY) |
207 | 207 | ||
208 | zip: | 208 | zip: |
209 | $(SILENT)for f in `cat $(BUILDDIR)/apps/features`; do feat="$$feat:$$f" ; done ; \ | 209 | $(SILENT)for f in `cat $(BUILDDIR)/apps/features`; do feat="$$feat:$$f" ; done ; \ |
210 | $(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -t \"$(MODELNAME)$$feat\" -i \"$(TARGET_ID)\" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" $(TARGET) $(BINARY) | 210 | $(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -m \"$(MODELNAME)\" -i \"$(TARGET_ID)\" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" $(TARGET) $(BINARY) |
211 | 211 | ||
212 | mapzip: | 212 | mapzip: |
213 | $(SILENT)find . -name "*.map" | xargs zip rockbox-maps.zip | 213 | $(SILENT)find . -name "*.map" | xargs zip rockbox-maps.zip |
214 | 214 | ||
215 | fullzip: | 215 | fullzip: |
216 | $(SILENT)for f in `cat $(BUILDDIR)/apps/features`; do feat="$$feat:$$f" ; done; \ | 216 | $(SILENT)for f in `cat $(BUILDDIR)/apps/features`; do feat="$$feat:$$f" ; done; \ |
217 | $(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -t \"$(MODELNAME)$$feat\" -i \"$(TARGET_ID)\" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 2 -o rockbox-full.zip $(TARGET) $(BINARY) | 217 | $(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -m \"$(MODELNAME)\" -i \"$(TARGET_ID)\" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 2 -o rockbox-full.zip $(TARGET) $(BINARY) |
218 | 218 | ||
219 | 7zip: | 219 | 7zip: |
220 | $(SILENT)for f in `cat $(BUILDDIR)/apps/features`; do feat="$$feat:$$f" ; done; \ | 220 | $(SILENT)for f in `cat $(BUILDDIR)/apps/features`; do feat="$$feat:$$f" ; done; \ |
221 | $(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -t \"$(MODELNAME)$$feat\" -i \"$(TARGET_ID)\" -o "rockbox.7z" -z "7za a -mx=9" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" $(TARGET) $(BINARY) | 221 | $(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -m \"$(MODELNAME)\" -i \"$(TARGET_ID)\" -o "rockbox.7z" -z "7za a -mx=9" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" $(TARGET) $(BINARY) |
222 | 222 | ||
223 | tar: | 223 | tar: |
224 | $(SILENT)rm -f rockbox.tar | 224 | $(SILENT)rm -f rockbox.tar |
225 | $(SILENT)for f in `cat $(BUILDDIR)/apps/features`; do feat="$$feat:$$f" ; done; \ | 225 | $(SILENT)for f in `cat $(BUILDDIR)/apps/features`; do feat="$$feat:$$f" ; done; \ |
226 | $(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -t \"$(MODELNAME)$$feat\" -i \"$(TARGET_ID)\" -o "rockbox.tar" -z "tar -cf" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" $(TARGET) $(BINARY) | 226 | $(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -m \"$(MODELNAME)\" -i \"$(TARGET_ID)\" -o "rockbox.tar" -z "tar -cf" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" $(TARGET) $(BINARY) |
227 | 227 | ||
228 | bzip2: tar | 228 | bzip2: tar |
229 | $(SILENT)bzip2 -f9 rockbox.tar | 229 | $(SILENT)bzip2 -f9 rockbox.tar |
@@ -256,12 +256,12 @@ ifdef SIMVER | |||
256 | install: | 256 | install: |
257 | @echo "Installing your build in your 'simdisk' dir" | 257 | @echo "Installing your build in your 'simdisk' dir" |
258 | $(SILENT)for f in `cat $(BUILDDIR)/apps/features`; do feat="$$feat:$$f" ; done; \ | 258 | $(SILENT)for f in `cat $(BUILDDIR)/apps/features`; do feat="$$feat:$$f" ; done; \ |
259 | $(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -t \"$(MODELNAME)$$feat\" -i \"$(TARGET_ID)\" -s -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 0 $(TARGET) $(BINARY) | 259 | $(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -m \"$(MODELNAME)\" -i \"$(TARGET_ID)\" -s -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 0 $(TARGET) $(BINARY) |
260 | 260 | ||
261 | fullinstall: | 261 | fullinstall: |
262 | @echo "Installing a full setup in your 'simdisk' dir" | 262 | @echo "Installing a full setup in your 'simdisk' dir" |
263 | $(SILENT)for f in `cat $(BUILDDIR)/apps/features`; do feat="$$feat:$$f" ; done; \ | 263 | $(SILENT)for f in `cat $(BUILDDIR)/apps/features`; do feat="$$feat:$$f" ; done; \ |
264 | $(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -t \"$(MODELNAME)$$feat\" -i \"$(TARGET_ID)\" -s -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 2 $(TARGET) $(BINARY) | 264 | $(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -m \"$(MODELNAME)\" -i \"$(TARGET_ID)\" -s -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 2 $(TARGET) $(BINARY) |
265 | 265 | ||
266 | endif | 266 | endif |
267 | 267 | ||
diff --git a/wps/cabbiev2.128x64x1.clip.wps b/wps/cabbiev2.128x64x1.clip.wps new file mode 100644 index 0000000000..f6b3e01f6e --- /dev/null +++ b/wps/cabbiev2.128x64x1.clip.wps | |||
@@ -0,0 +1,35 @@ | |||
1 | # cabbie 2.0 default rwps for Iriver Players by Johannes Voggenthaler (Zinc Alloy) | ||
2 | # derived from cabbie 2.0 default rwps (C) 2007, Marc Guay | ||
3 | # modified for the Sansa Clip, 2009, Bertrik Sikken, Thomas Martitz | ||
4 | |||
5 | %wd | ||
6 | |||
7 | # progressbar viewport | ||
8 | %V|0|0|128|16|1| | ||
9 | %pb|pb-128x64x1.bmp|2|1|124|4| | ||
10 | %x|a|pbbackground-128x64x1.bmp|1|0| | ||
11 | %pp of %pe%ar%pc | ||
12 | |||
13 | # tag info viewport | ||
14 | %V|0|18|128|25|1| | ||
15 | %ac%s%?it<%it|%fn> | ||
16 | %ac%s%?ia<%ia|%?d2<%d2|(root)>> | ||
17 | %ac%s%?id<%id|%?d1<%d1|(root)>> | ||
18 | %x|b|bar-128x64x1.bmp|2|32| | ||
19 | |||
20 | # playtime info and status bar | ||
21 | %V|2|43|124|21|1| | ||
22 | %xl|A|lock-128x64x1.bmp|1|12|2| | ||
23 | %xl|B|battery-128x64x1.bmp|23|12|9| | ||
24 | %xl|C|volume-128x64x1.bmp|46|12|9| | ||
25 | %xl|D|shuffle-128x64x1.bmp|67|13| | ||
26 | %xl|E|repeat-128x64x1.bmp|93|12|4| | ||
27 | %xl|F|playmode-128x64x1.bmp|113|12|5| | ||
28 | |||
29 | # status bar | ||
30 | %?mh<%xdAa|%xdAb> | ||
31 | %?bp<%?bc<%xdBa|%xdBb>|%?bl<|%xdBc|%xdBd|%xdBe|%xdBf|%xdBg|%xdBh|%xdBi>> | ||
32 | %?pv<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi> | ||
33 | %?ps<%xdD> | ||
34 | %?mm<|%xdEa|%xdEb|%xdEc|%xdEd> | ||
35 | %?mp<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe> | ||
diff --git a/wps/wpsbuild.pl b/wps/wpsbuild.pl index 278d104771..af4c7c411f 100755 --- a/wps/wpsbuild.pl +++ b/wps/wpsbuild.pl | |||
@@ -16,9 +16,11 @@ my $verbose; | |||
16 | my $rbdir=".rockbox"; | 16 | my $rbdir=".rockbox"; |
17 | my $wpslist; | 17 | my $wpslist; |
18 | my $target; | 18 | my $target; |
19 | my $modelname; | ||
19 | 20 | ||
20 | # Get options | 21 | # Get options |
21 | GetOptions ( 'r|root=s' => \$ROOT, | 22 | GetOptions ( 'r|root=s' => \$ROOT, |
23 | 'm|modelname=s' => \$modelname, | ||
22 | 'v|verbose' => \$verbose, | 24 | 'v|verbose' => \$verbose, |
23 | 'rbdir=s' => \$rbdir, # If we want to put in a different directory | 25 | 'rbdir=s' => \$rbdir, # If we want to put in a different directory |
24 | ); | 26 | ); |
@@ -373,6 +375,10 @@ while(<WPS>) { | |||
373 | 375 | ||
374 | $req_g = $rwidth . "x" . $rheight . "x" . $d; | 376 | $req_g = $rwidth . "x" . $rheight . "x" . $d; |
375 | 377 | ||
378 | # check for model specific wps | ||
379 | $req_g_wps = $wps_prefix . "." . $req_g . "." . $modelname . ".wps"; | ||
380 | last if (-e "$wpsdir/$req_g_wps"); | ||
381 | |||
376 | $req_g_wps = $wps_prefix . "." . $req_g . ".wps"; | 382 | $req_g_wps = $wps_prefix . "." . $req_g . ".wps"; |
377 | last if (-e "$wpsdir/$req_g_wps"); | 383 | last if (-e "$wpsdir/$req_g_wps"); |
378 | 384 | ||