len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-22 03:22:48 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make kbd_input() show a cancel splash to indicate user abort better and for better consistency all over the place. Change checking for its return value (style-wise) at some places too.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22269 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thomas Martitz 2009-08-12 14:38:25 +00:00
parent 345920fe7e
commit 18e40e0f4c
11 changed files with 26 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
apps/plugins/calendar.c
View file

@ -568,7 +568,7 @@ static void add_memo(struct shown *shown, int type)
{
bool saved = false;
if (rb->kbd_input(memos[memos_in_memory].message,
sizeof memos[memos_in_memory].message) != -1)
sizeof memos[memos_in_memory].message) == 0)
{
if (rb->strlen(memos[memos_in_memory].message))
{
@ -634,7 +634,7 @@ static bool edit_memo(int change, struct shown *shown)
case 1: /* edit */
if(rb->kbd_input(memos[pointer_array[change]].message,
sizeof memos[pointer_array[change]].message) != -1)
sizeof memos[pointer_array[change]].message) == 0)
save_memo(pointer_array[change],true,shown);
return false;

12
apps/plugins/keybox.c
View file

@ -190,12 +190,12 @@ static void add_entry(int selected_item)
rb->splash(HZ, "Enter title");
pw_list.entries[i].title[0] = '\0';
if (rb->kbd_input(pw_list.entries[i].title, FIELD_LEN))
if (rb->kbd_input(pw_list.entries[i].title, FIELD_LEN) < 0)
return;
rb->splash(HZ, "Enter name");
pw_list.entries[i].name[0] = '\0';
if (rb->kbd_input(pw_list.entries[i].name, FIELD_LEN))
if (rb->kbd_input(pw_list.entries[i].name, FIELD_LEN) < 0)
{
pw_list.entries[i].title[0] = '\0';
return;
@ -203,7 +203,7 @@ static void add_entry(int selected_item)
rb->splash(HZ, "Enter password");
pw_list.entries[i].password[0] = '\0';
if (rb->kbd_input(pw_list.entries[i].password, FIELD_LEN))
if (rb->kbd_input(pw_list.entries[i].password, FIELD_LEN) < 0)
{
pw_list.entries[i].title[0] = '\0';
pw_list.entries[i].name[0] = '\0';
@ -508,11 +508,11 @@ static int enter_pw(char *pw_buf, size_t buflen, bool new_pw)
if (new_pw)
{
rb->splash(HZ, "Enter new master password");
if (rb->kbd_input(buf[0], sizeof(buf[0])))
if (rb->kbd_input(buf[0], sizeof(buf[0])) < 0)
return -1;
rb->splash(HZ, "Confirm master password");
if (rb->kbd_input(buf[1], sizeof(buf[1])))
if (rb->kbd_input(buf[1], sizeof(buf[1])) < 0)
return -1;
if (rb->strcmp(buf[0], buf[1]))
@ -529,7 +529,7 @@ static int enter_pw(char *pw_buf, size_t buflen, bool new_pw)
}
rb->splash(HZ, "Enter master password");
if (rb->kbd_input(pw_buf, buflen))
if (rb->kbd_input(pw_buf, buflen) < 0)
return -1;
hash_pw(&pwhash);
return 0;

2
apps/plugins/rockboy/menu.c
View file

@ -227,7 +227,7 @@ static bool do_slot(size_t slot_id, bool is_load) {
/* if we're saving to a slot, then get a brief description */
if (!is_load)
if (rb->kbd_input(desc_buf, 20) || !strlen(desc_buf))
if (rb->kbd_input(desc_buf, 20) || !strlen(desc_buf) < 0)
{
strlcpy(desc_buf, "Untitled", 20);
}

3
apps/plugins/text_editor.c
View file

@ -182,10 +182,9 @@ bool save_changes(int overwrite)
if (newfile || !overwrite)
{
if(rb->kbd_input(filename,MAX_PATH))
if(rb->kbd_input(filename,MAX_PATH) < 0)
{
newfile = true;
rb->splash(HZ, "Cancelled");
return false;
}
}