Commit graph

245 commits

Author SHA1 Message Date
Björn Stenberg
b1b8bd4dd1 Moved on_screen, f2_screen, f3_screen and handle_usb (renamed usb_screen) to a new file: screens.c.
typedef Menu replaced with a bool.
All code now calls usb_screen() for usb handling.
Nearly all code now deals with USB connect/disconnect properly.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2401 a1c6a512-1295-4272-9138-f99709370657
2002-09-24 17:22:12 +00:00
Björn Stenberg
b0cd912f55 Added proper quickscreen to F3 in menus
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2399 a1c6a512-1295-4272-9138-f99709370657
2002-09-24 14:52:23 +00:00
Björn Stenberg
bed3d3f7e0 New full ISO-8859-1 system font.
Added font loading from dir browser.
Changed default font location to /.rockbox/default.fnt.
Code-policed font code.
Removed old font tools.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2347 a1c6a512-1295-4272-9138-f99709370657
2002-09-20 08:07:51 +00:00
Eric Linenberg
038df5cdc9 Daniel,
The following patch makes loadable fonts actually work (finally!).
It took me quite a while, but I finally figured out why the sim
worked and the target didn't: the SH1 processor won't read
longwords from a shortword alignment... I had to rev the .fnt
file to version 1.1 (requires remaking *.fnt files) in order
to fix this.  Please apply the following patch completely.
It's diffed against the latest CVS.

I've also attached rockbox-fonts-1.1.tar.gz which includes
known working *.fnt files, including a courB08 system.fnt,
for demonstration.

Now the real work can begin...  Although the new
system.fnt will work fine, if you try going to a really
big font (try copying courB14.fnt to system.fnt), then
you will find that it comes up and works in tree mode,
but will crash the system when going into WPS
mode...  I'm sure this is because of the low-level
lcd_bitmap not clipping properly when given a too-large
bitmap, which the characters become.  I haven't yet
tried to debug the low-level driver.  Of course, it all
works on the sim...

So the apps developers will now have to make sure that
all apps screen sizes may vary according to the loaded font.
The font height can be gotten through the lcd_getfontsize API.

Files patched in fonts-6.patch

1. apps/menu.c - LCD_PROPFONTS error (2nd resubmission on this, please checkin)

2. firmware/font.c - fixes and reformatting.  Please check this in as is,
my vi editor requires more reformatting changes since I left tabs in the
file, these are removed now (2nd resubmission on this, please checkin)

3. firmware/fonts.h - doc change on .fnt file format, .fnt version
number incremented.

4. firmware/loadfont.c - fixes to load font properly, typedefs
removed.

5. firmware/system.c - lcd_setfont(FONT_SYSFIXED) before
issuing error, otherwise font may not exist.

6. tools/bdf2c - fixes for correct output when filename starts
with a number, as well as when no DEFAULT_CHAR in .bdf
file.  (2nd resubmission on this, please checkin)

7. tools/writerbf.c - fixes for bugfixed fontfile format.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2294 a1c6a512-1295-4272-9138-f99709370657
2002-09-16 03:18:49 +00:00
Daniel Stenberg
93b231c693 Greg Haerr's new loadable font. No more #ifdef font-style, removed old
propfont and loadable font code. New font file format.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2269 a1c6a512-1295-4272-9138-f99709370657
2002-09-12 13:33:59 +00:00
Björn Stenberg
3b97474978 lcd_puts() now clears to end-of-line
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2252 a1c6a512-1295-4272-9138-f99709370657
2002-09-09 23:57:00 +00:00
Eric Linenberg
c076b27dfc Added menu wrap. It works on the recorder, but I can't test on the player... hopefully it plays okay!
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2165 a1c6a512-1295-4272-9138-f99709370657
2002-09-04 04:21:10 +00:00
Björn Stenberg
90851c5492 Clear button queue when leaving menu
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2135 a1c6a512-1295-4272-9138-f99709370657
2002-09-02 14:50:37 +00:00
Björn Stenberg
40d866bd9e Fixed build errors
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2113 a1c6a512-1295-4272-9138-f99709370657
2002-09-01 20:08:08 +00:00
Justin Heiner
b5025a8c40 USB Related:
Consolidated some more of the USB code in the WPS.
    Have backlight turn offf when USB Connected.
menu.c:
    LINE_X was set wrong for player.
settings_menu.c / wps-display.c:
    Added 1 Line ID3+. Has progress bar & Kbps.
    Renamed some of the WPS options to be more readable.
wps.c / wps-display.c
    Fixed problem with FF/REW when 'Remaining Time' is on.
    Added %pb to the WPS mix. Player progress bar thingy.
    Thanks to whoever fixed my PLAYER_PROGRESS function :-)
    Changed how volume changes on player (works better now).
    General cleanup of Custom WPS code.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2091 a1c6a512-1295-4272-9138-f99709370657
2002-08-31 04:58:35 +00:00
Markus Braun
000c2db035 Added scrollbar to tree view and menus.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2084 a1c6a512-1295-4272-9138-f99709370657
2002-08-30 13:49:32 +00:00
Daniel Stenberg
49984facc1 properly remember DISK_CHANGE status and return that to menu parents,
also when coming back from the USB screen set back the status bar state
before redrawing the menu.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1953 a1c6a512-1295-4272-9138-f99709370657
2002-08-23 12:57:00 +00:00
Daniel Stenberg
aa458aa9d8 MENU_DISK_CHANGED is the new value for telling disk content might have
changed


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1949 a1c6a512-1295-4272-9138-f99709370657
2002-08-23 12:41:25 +00:00
Daniel Stenberg
b285076925 Remade the menu system slightly. All functions invoked from menus now use
the Menu typedef as return type, and *ALL* menus that intercept USB connect
can then return MENU_REFRESH_DIR so that the parent (any parent really) that
do file or dir-accesses knows that and can do the refresh. If no refresh
is needed by the parent, MENU_OK is returned.

Somewhat biggish commit this close to 1.3, but we need to sort out this
refresh-after-usb-connected business.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1948 a1c6a512-1295-4272-9138-f99709370657
2002-08-23 12:32:52 +00:00
Justin Heiner
0a3589d129 OK, a (hopefully) successful attempt at getting rid of the yellows that I created by removing the other yellows
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1938 a1c6a512-1295-4272-9138-f99709370657
2002-08-23 02:45:39 +00:00
Justin Heiner
edf6b80547 Forgot to #ifdef something
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1937 a1c6a512-1295-4272-9138-f99709370657
2002-08-23 02:26:22 +00:00
Justin Heiner
2630245cb9 Added NSauzede's patch to detect USB while in a Menu. It also adds the USB icon to the player while in USB mode.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1935 a1c6a512-1295-4272-9138-f99709370657
2002-08-23 02:17:00 +00:00
Daniel Stenberg
a8e89fd693 when we want to stop the scroll and clear the screen, it is a lot better
to first pause the scroll (stop puts back text on screen) and then clear
the screen.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1931 a1c6a512-1295-4272-9138-f99709370657
2002-08-22 21:45:22 +00:00
Markus Braun
5e4c1d2ad8 enabled status bar in menus on recorders
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1822 a1c6a512-1295-4272-9138-f99709370657
2002-08-20 19:37:00 +00:00
Björn Stenberg
71f71ef837 Removed warnings
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1667 a1c6a512-1295-4272-9138-f99709370657
2002-08-11 09:20:53 +00:00
Björn Stenberg
cd225736f9 First version of loadable fonts patch by Alex Gitelman
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1666 a1c6a512-1295-4272-9138-f99709370657
2002-08-11 09:17:47 +00:00
Björn Stenberg
cbc717941d Added key repeat for up/down on recorder
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1660 a1c6a512-1295-4272-9138-f99709370657
2002-08-10 09:04:55 +00:00
Daniel Stenberg
7cdf5c8cab player sim uses big font now, adjust the cursor routine
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1634 a1c6a512-1295-4272-9138-f99709370657
2002-08-09 09:13:00 +00:00
Linus Nielsen Feltzing
8fa021785b Scrolling menus by Justin Heiner
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1515 a1c6a512-1295-4272-9138-f99709370657
2002-08-02 07:59:25 +00:00
Linus Nielsen Feltzing
a552f4c99d Menus now also exits with F1 on recorder
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1468 a1c6a512-1295-4272-9138-f99709370657
2002-07-27 19:53:26 +00:00
Daniel Stenberg
c4be1ee9f9 simulated player text lines are moved down 8 pixels to make room for icons
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1079 a1c6a512-1295-4272-9138-f99709370657
2002-06-19 13:00:14 +00:00
Robert Hak
4164f58471 increased lines on menu display
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1021 a1c6a512-1295-4272-9138-f99709370657
2002-06-16 23:27:58 +00:00
Daniel Stenberg
e35f8eb603 made the player simulator get a "nice" cursor too!
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1009 a1c6a512-1295-4272-9138-f99709370657
2002-06-15 11:39:36 +00:00
Daniel Stenberg
698ebc8412 hehe, we better clear at y*8 not y*6 ;-)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@997 a1c6a512-1295-4272-9138-f99709370657
2002-06-14 09:10:36 +00:00
Daniel Stenberg
17f8390c44 the cursor is now only 4 pixels wide
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@995 a1c6a512-1295-4272-9138-f99709370657
2002-06-14 09:03:08 +00:00
Daniel Stenberg
bf603f98cb made to use the new cursor bitmap on the recorder, so put_cursorxy() is
now a better way to position the cursor


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@993 a1c6a512-1295-4272-9138-f99709370657
2002-06-14 08:47:44 +00:00
Björn Stenberg
9314a68db6 Replaced - cursor with more suitable char for player
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@848 a1c6a512-1295-4272-9138-f99709370657
2002-05-31 09:04:51 +00:00
Robert Hak
c501ac7be2 corrected the curson not being drawn for the recorder
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@814 a1c6a512-1295-4272-9138-f99709370657
2002-05-30 08:06:42 +00:00
Björn Stenberg
4caebab366 Fixed draw bug. Removed wrapping.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@796 a1c6a512-1295-4272-9138-f99709370657
2002-05-29 14:25:06 +00:00
Björn Stenberg
60fad547e0 MENU exits menu
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@791 a1c6a512-1295-4272-9138-f99709370657
2002-05-29 12:28:08 +00:00
Björn Stenberg
f76cee7943 Menu now supports scrolling
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@769 a1c6a512-1295-4272-9138-f99709370657
2002-05-28 15:35:33 +00:00
Björn Stenberg
856a13a2d2 Adapted to modified button_get() call
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@760 a1c6a512-1295-4272-9138-f99709370657
2002-05-28 12:10:12 +00:00
Björn Stenberg
2ac057241a Added support for nested menus
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@707 a1c6a512-1295-4272-9138-f99709370657
2002-05-26 17:03:17 +00:00
Björn Stenberg
1c21296a5a Cut away some single-use functions
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@673 a1c6a512-1295-4272-9138-f99709370657
2002-05-23 14:11:42 +00:00
Björn Stenberg
c42644d2f4 Removed cursor flicker
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@648 a1c6a512-1295-4272-9138-f99709370657
2002-05-21 15:04:23 +00:00
Björn Stenberg
b21a3bd240 Abstracted the menu interface
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@641 a1c6a512-1295-4272-9138-f99709370657
2002-05-21 14:25:45 +00:00
Robert Hak
b97a2f5e0d minor changes
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@639 a1c6a512-1295-4272-9138-f99709370657
2002-05-21 08:48:44 +00:00
Robert Hak
dfba210850 minor changes
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@638 a1c6a512-1295-4272-9138-f99709370657
2002-05-21 08:47:34 +00:00
Robert Hak
7ec9aa3bd8 made the logo display a true splash screen
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@631 a1c6a512-1295-4272-9138-f99709370657
2002-05-18 11:41:37 +00:00
Daniel Stenberg
1c0c861451 moved from the simulator dir
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@614 a1c6a512-1295-4272-9138-f99709370657
2002-05-17 12:22:24 +00:00