Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 1 addition & 18 deletions src/apple2/input.c
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@ void input_line(unsigned char x, unsigned char y, unsigned char o, char *c, unsi
cputc(' ');
c[i] = 0;
return; // done
break;
default:
if (i < len)
{
Expand Down Expand Up @@ -264,9 +263,7 @@ SFSubState input_select_file_choose(void)
}
if (pos > 0)
return SF_PREV_PAGE;
else
return SF_DEVANCE_FOLDER;
return SF_CHOOSE;
return SF_DEVANCE_FOLDER;
case KEY_DOWN_ARROW:
case 'm':
case 'M':
Expand All @@ -279,7 +276,6 @@ SFSubState input_select_file_choose(void)
select_display_long_filename();
return SF_CHOOSE;
}
break;
case ',':
case '<':
if (pos > 0)
Expand Down Expand Up @@ -379,16 +375,6 @@ SSSubState input_select_slot_choose(void)
selected_device_slot=bar_get();
mode = MODE_READ;
return SS_DONE;
// Ask for mode.
screen_select_slot_mode();
k = input_select_slot_mode(&mode);

if (!k)
{
state = SELECT_FILE;
backToFiles = true;
}
return SS_DONE;
case 'W':
case 'w':
selected_device_slot=bar_get();
Expand Down Expand Up @@ -459,7 +445,6 @@ SISubState input_show_info(void)
state = HOSTS_AND_DEVICES;
return SI_DONE;
}
return SI_SHOWINFO;
}

HDSubState input_hosts_and_devices_hosts(void)
Expand Down Expand Up @@ -571,13 +556,11 @@ HDSubState input_hosts_and_devices_devices(void)
selected_device_slot=bar_get();
hosts_and_devices_devices_set_mode(MODE_READ);
return HD_DEVICES;
break;
case 'W':
case 'w':
selected_device_slot=bar_get();
hosts_and_devices_devices_set_mode(MODE_WRITE);
return HD_DEVICES;
break;
// case KEY_CLEAR:
// return HD_CLEAR_ALL_DEVICES;
case KEY_UP_ARROW:
Expand Down
9 changes: 1 addition & 8 deletions src/atari/input.c
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,6 @@ HDSubState input_hosts_and_devices_hosts(void)
default: // Anything but Y/y take to mean "no"
return HD_HOSTS;
}
return HD_HOSTS;
case KCODE_RETURN:
selected_host_slot = bar_get() - HOSTS_START_Y;
if ( !wifiEnabled && strcmp((char *) hostSlots[selected_host_slot],"SD") != 0) // Don't go in a TNFS host if wifi is disabled.
Expand Down Expand Up @@ -461,7 +460,6 @@ HDSubState input_hosts_and_devices_devices(void)
default: // Anything but Y/y take to mean "no"
return HD_DEVICES;
}
return HD_DEVICES;
case '!':
mount_and_boot();
default:
Expand Down Expand Up @@ -547,9 +545,7 @@ SFSubState input_select_file_choose(void)
}
if ( pos > 0 )
return SF_PREV_PAGE;
else
return SF_DEVANCE_FOLDER;
return SF_CHOOSE;
return SF_DEVANCE_FOLDER;
case 0x87:
case '>':
if ((ENTRIES_PER_PAGE == _visibleEntries ) && (dir_eof == false))
Expand Down Expand Up @@ -674,16 +670,13 @@ unsigned char input_select_slot_mode(char *mode)
{
case KCODE_ESCAPE:
return 0;
break;
case 'W':
mode[0] = 2;
return 1;
break;
case KCODE_RETURN:
case 'R':
mode[0] = 1;
return 1;
break;
default:
break;
}
Expand Down
16 changes: 5 additions & 11 deletions src/c64/input.c
Original file line number Diff line number Diff line change
Expand Up @@ -176,14 +176,11 @@ SFSubState input_select_file_choose(void)
case KEY_RIGHT_ARROW:
if ((bar_get() == 14) && (dir_eof == false))
return SF_NEXT_PAGE;
else
{
long_entry_displayed = false;
bar_down();
select_display_long_filename();
return SF_CHOOSE;
}
break;

long_entry_displayed = false;
bar_down();
select_display_long_filename();
return SF_CHOOSE;
case ',':
case '<':
if (pos > 0)
Expand Down Expand Up @@ -309,7 +306,6 @@ SISubState input_show_info(void)
state = HOSTS_AND_DEVICES;
return SI_DONE;
}
return SI_SHOWINFO;
}

HDSubState input_hosts_and_devices_hosts(void)
Expand Down Expand Up @@ -395,13 +391,11 @@ HDSubState input_hosts_and_devices_devices(void)
selected_device_slot = bar_get();
hosts_and_devices_devices_set_mode(0);
return HD_DEVICES;
break;
case 'W':
case 'w':
selected_device_slot = bar_get();
hosts_and_devices_devices_set_mode(2);
return HD_DEVICES;
break;
// case KEY_CLEAR:
// return HD_CLEAR_ALL_DEVICES;
case KEY_UP_ARROW:
Expand Down