len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-13 18:17:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix up statusbar handling in the usb screen a bit more, using the GUI_EVENT_ACTIONUPDATE event instead of direct draw (with the custom statusbar patch in my mind), actually fix statusbar updates for the simulator version of the usb screen. Increase timeouts a bit too.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22540 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thomas Martitz 2009-08-29 17:41:00 +00:00
parent dd5789b9b9
commit 1a28d40335
1 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

23
apps/screens.c
View file

@ -96,7 +96,10 @@ static int clamp_value_wrap(int value, int max, int min)
#ifndef SIMULATOR #ifndef SIMULATOR
static int handle_usb_events(void) static int handle_usb_events(void)
{ {
#if (CONFIG_STORAGE & STORAGE_MMC)
int next_update=0; int next_update=0;
#endif /* STORAGE_MMC */
#ifdef HAVE_TOUCHSCREEN #ifdef HAVE_TOUCHSCREEN
enum touchscreen_mode old_mode = touchscreen_get_mode(); enum touchscreen_mode old_mode = touchscreen_get_mode();
@ -115,7 +118,7 @@ static int handle_usb_events(void)
if (hid_enabled) if (hid_enabled)
{ {
int id = HID_CONSUMER_USAGE_UNASSIGNED; int id = HID_CONSUMER_USAGE_UNASSIGNED;
button = get_action(CONTEXT_USB_HID, HZ/4); button = get_action(CONTEXT_USB_HID, HZ/2);
switch (button) switch (button)
{ {
@ -147,7 +150,11 @@ static int handle_usb_events(void)
} }
else else
#endif #endif
button = button_get_w_tmo(HZ/4); {
button = button_get_w_tmo(HZ/2);
/* hid emits the event in get_action */
send_event(GUI_EVENT_ACTIONUPDATE, NULL);
}
switch(button) switch(button)
{ {
@ -158,16 +165,15 @@ static int handle_usb_events(void)
break; break;
} }
#if (CONFIG_STORAGE & STORAGE_MMC) /* USB-MMC bridge can report activity */
if(TIME_AFTER(current_tick,next_update)) if(TIME_AFTER(current_tick,next_update))
{ {
if(usb_inserted()) { if(usb_inserted()) {
#if (CONFIG_STORAGE & STORAGE_MMC) /* USB-MMC bridge can report activity */
led(mmc_usb_active(HZ)); led(mmc_usb_active(HZ));
#endif /* STORAGE_MMC */
gui_syncstatusbar_draw(&statusbars, false);
} }
next_update=current_tick+HZ/2; next_update=current_tick+HZ/2;
} }
#endif /* STORAGE_MMC */
} }
Exit: Exit:
#ifdef HAVE_TOUCHSCREEN #ifdef HAVE_TOUCHSCREEN
@ -224,7 +230,12 @@ void usb_screen(void)
viewportmanager_set_statusbar(usb_bars); viewportmanager_set_statusbar(usb_bars);
#ifdef SIMULATOR #ifdef SIMULATOR
while (button_get(true) & BUTTON_REL); while (1)
{
if (button_get_w_tmo(HZ/2))
break;
send_event(GUI_EVENT_ACTIONUPDATE, NULL);
}
#else #else
usb_acknowledge(SYS_USB_CONNECTED_ACK); usb_acknowledge(SYS_USB_CONNECTED_ACK);
while (handle_usb_events()); while (handle_usb_events());