mirror of
https://github.com/Oibaf66/frodo-wii.git
synced 2024-11-22 11:29:24 +01:00
Correct listing
This commit is contained in:
parent
a2725ef19f
commit
7611af0e16
2
Makefile
2
Makefile
@ -60,7 +60,7 @@ export DEPSDIR := $(CURDIR)/$(BUILD)
|
||||
#---------------------------------------------------------------------------------
|
||||
# automatically build a list of object files for our project
|
||||
#---------------------------------------------------------------------------------
|
||||
CFILES := char_to_kc.c gcaudio.c
|
||||
CFILES := gcaudio.c
|
||||
CPPFILES := Display.cpp main.cpp Prefs.cpp SID.cpp REU.cpp IEC.cpp 1541fs.cpp \
|
||||
1541d64.cpp 1541t64.cpp 1541job.cpp SAM.cpp C64_SC.cpp CPUC64_SC.cpp VIC_SC.cpp \
|
||||
CIA_SC.cpp CPU1541_SC.cpp menu.cpp CPU_common.cpp VirtualKeyboard.cpp
|
||||
|
@ -350,6 +350,7 @@ void C64::run_fake_key_sequence()
|
||||
{
|
||||
this->fake_key_keytime = 4;
|
||||
this->fake_key_index ++;
|
||||
TheDisplay->FakeKeyPress(-1, TheCIA1->KeyMatrix, TheCIA1->RevMatrix);
|
||||
|
||||
if (this->fake_key_str[this->fake_key_index] == '\0')
|
||||
{
|
||||
@ -370,15 +371,13 @@ void C64::select_fake_key_sequence(Prefs *np)
|
||||
{
|
||||
static const char *fake_key_sequences[] = {
|
||||
"\nLOAD \"*\",8,1\nRUN\n",
|
||||
"\nLOAD \"?\",8\n",
|
||||
"\nLOAD \"$\",8\n",
|
||||
"\nLIST\n",
|
||||
"\n10 PRINT \"HELLO WORLD\"\n20 GOTO 10\nRUN\n",
|
||||
NULL};
|
||||
const char *fake_key_messages[] = {
|
||||
"LOAD \"*\",8,1 and RUN",
|
||||
"LOAD \"?\",8",
|
||||
"LOAD \"$\",8",
|
||||
"LIST",
|
||||
"10 PRINT \"HELLO WORLD\" and 20 GOTO 10",
|
||||
"Type with virtual keyboard",
|
||||
NULL};
|
||||
int opt;
|
||||
@ -388,7 +387,7 @@ void C64::select_fake_key_sequence(Prefs *np)
|
||||
if (opt < 0)
|
||||
return;
|
||||
|
||||
if (opt == 4)
|
||||
if (opt == 3)
|
||||
{
|
||||
const char *seq = this->virtual_keyboard->get_string();
|
||||
|
||||
|
@ -28,7 +28,7 @@ INSTALL_DATA = ${INSTALL} -m 644
|
||||
## Files
|
||||
GUIOBJS =
|
||||
OBJS = $(GUIOBJS) main.o Prefs.o SID.o REU.o IEC.o 1541fs.o \
|
||||
1541d64.o 1541t64.o 1541job.o SAM.o CmdPipe.o menu.o char_to_kc.o Network.o \
|
||||
1541d64.o 1541t64.o 1541job.o SAM.o CmdPipe.o menu.o Network.o \
|
||||
VirtualKeyboard.o
|
||||
SLOBJS = $(OBJS) C64.o CPUC64.o VIC.o CIA.o CPU1541.o Display.o
|
||||
SLFLAGS = -DPRECISE_CPU_CYCLES=1 -DPRECISE_CIA_CYCLES=1 -DPC_IS_POINTER=0
|
||||
@ -39,7 +39,7 @@ SRCS = $(GUISRCS) main.cpp Display.cpp Prefs.cpp SID.cpp REU.cpp IEC.cpp 1541
|
||||
1541d64.cpp 1541t64.cpp 1541job.cpp SAM.cpp CmdPipe.cpp C64.cpp \
|
||||
C64_SC.cpp CPUC64.cpp CPUC64_SC.cpp VIC.cpp VIC_SC.cpp CIA.cpp \
|
||||
CIA_SC.cpp CPU1541.cpp CPU1541_PC.cpp CPU1541_SC.cpp CPU_common.cpp \
|
||||
menu.cpp char_to_kc.c
|
||||
menu.cpp
|
||||
|
||||
## Rules
|
||||
.PHONY: install installdirs uninstall clean distclean depend dep
|
||||
|
@ -106,6 +106,8 @@ void VirtualKeyboard::draw()
|
||||
if (this->shift_on && shifted_names[which])
|
||||
what = shifted_names[which];
|
||||
|
||||
if ( key.is_done )
|
||||
r = 0;
|
||||
if ( (x == this->sel_x && y == this->sel_y) ||
|
||||
(this->shift_on && key.is_shift))
|
||||
b = 0;
|
||||
|
Loading…
Reference in New Issue
Block a user