xxq250
/
Nasal-Interpreter
mirror of https://github.com/ValKmjolnir/Nasal-Interpreter.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix bug in libkey and test/tetris.nas

This commit is contained in:
ValKmjolnir 2022-02-22 18:01:49 +08:00
parent 9456a903d7
commit f05acaecc7
2 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
module/keyboard.cpp
View File

@ -10,22 +10,19 @@
#ifndef _WIN32 #ifndef _WIN32
static struct termios init_termios; static struct termios init_termios;
static struct termios new_termios; static struct termios new_termios;
static int peek_character=-1; static int peek_char=-1;
int kbhit(){ int kbhit(){
unsigned char ch=0; unsigned char ch=0;
int nread=0; int nread=0;
if(peek_character!=-1) if(peek_char!=-1)
return 1; return 1;
int flag=fcntl(0,F_GETFL); int flag=fcntl(0,F_GETFL);
flag|=O_NONBLOCK; fcntl(0,F_SETFL,flag|O_NONBLOCK);
fcntl(0,F_SETFL,flag);
nread=read(0,&ch,1); nread=read(0,&ch,1);
flag&=(~O_NONBLOCK);
fcntl(0,F_SETFL,flag); fcntl(0,F_SETFL,flag);
if(nread==1) if(nread==1){
{ peek_char=ch;
peek_character=ch;
return 1; return 1;
} }
return 0; return 0;
@ -33,10 +30,9 @@ int kbhit(){
int getch(){ int getch(){
int ch=0; int ch=0;
if(peek_character!=-1) if(peek_char!=-1){
{ ch=peek_char;
ch=peek_character; peek_char=-1;
peek_character=-1;
return ch; return ch;
} }
read(0,&ch,1); read(0,&ch,1);
@ -57,10 +53,13 @@ extern "C" nasal_ref nas_noblock(std::vector<nasal_ref>& args,nasal_gc& gc){
} }
extern "C" nasal_ref nas_init(std::vector<nasal_ref>& args,nasal_gc& gc){ extern "C" nasal_ref nas_init(std::vector<nasal_ref>& args,nasal_gc& gc){
#ifndef _WIN32 #ifndef _WIN32
tcflush(0,TCIOFLUSH);
tcgetattr(0,&init_termios); tcgetattr(0,&init_termios);
new_termios=init_termios; new_termios=init_termios;
new_termios.c_lflag&=~(ICANON|ECHO|ECHONL); new_termios.c_lflag&=~(ICANON|ECHO|ECHONL);
new_termios.c_cc[VMIN]=0; // vmin=0 is nonblock input, but in wsl there is a bug that will block input
// so we use fcntl to write the nonblock input
new_termios.c_cc[VMIN]=1;
new_termios.c_cc[VTIME]=0; new_termios.c_cc[VTIME]=0;
tcsetattr(0,TCSANOW,&new_termios); tcsetattr(0,TCSANOW,&new_termios);
#endif #endif
@ -68,8 +67,8 @@ extern "C" nasal_ref nas_init(std::vector<nasal_ref>& args,nasal_gc& gc){
} }
extern "C" nasal_ref nas_close(std::vector<nasal_ref>& args,nasal_gc& gc){ extern "C" nasal_ref nas_close(std::vector<nasal_ref>& args,nasal_gc& gc){
#ifndef _WIN32 #ifndef _WIN32
tcsetattr(0,TCSANOW,&init_termios);
tcflush(0,TCIOFLUSH); tcflush(0,TCIOFLUSH);
tcsetattr(0,TCSANOW,&init_termios);
#endif #endif
return nil; return nil;
} }

8
test/tetris.nas
View File

@ -260,6 +260,8 @@ var main=func(){
# windows use chcp 65001 to output unicode # windows use chcp 65001 to output unicode
if(os.platform()=="windows") if(os.platform()=="windows")
system("chcp 65001"); system("chcp 65001");
libkey.init();
print( print(
"\ec\e[1:1H", "\ec\e[1:1H",
"+-------------------------+\n", "+-------------------------+\n",
@ -275,7 +277,6 @@ var main=func(){
rand(time(0)); rand(time(0));
var map=mapgen(mapx:12,mapy:15); var map=mapgen(mapx:12,mapy:15);
libkey.init();
libkey.getch(); libkey.getch();
print("\ec"); print("\ec");
@ -313,12 +314,13 @@ var main=func(){
} }
} }
libkey.close(); libkey.close();
print( print(
map.gameover()? map.gameover()?
"\e[31mg\e[32ma\e[33mm\e[34me \e[35mo\e[36mv\e[94me\e[31mr \e[32m~\e[0m\n": "\e[31mg\e[32ma\e[33mm\e[34me \e[35mo\e[36mv\e[94me\e[31mr \e[32m~\e[0m\n":
"\e[31ms\e[32me\e[33me \e[34my\e[35mo\e[36mu \e[94m~\e[0m\n" "\e[31ms\e[32me\e[33me \e[34my\e[35mo\e[36mu \e[94m~\e[0m\n"
); );
print("enter anything to quit...\n");
input();
}; };
main(); main();