From cddc9dbef93093a96cb751174eb5102ad2a48904 Mon Sep 17 00:00:00 2001 From: CalcLoverHK <0v0katai@gmail.com> Date: Thu, 25 Jan 2024 02:50:28 +0800 Subject: [PATCH] FX 02.33.0000 --- fx/AddinInfo.txt | 2 +- fx/CBASIC.g1w | 2 +- fx/CBZ_edit.c | 12 +++++++----- fx/CBZ_file.c | 44 ++++++++++++++++++++++---------------------- fx/CBZ_inp.c | 24 ++++++++++++++++-------- fx/CBZ_setup.c | 4 ++-- 6 files changed, 49 insertions(+), 39 deletions(-) diff --git a/fx/AddinInfo.txt b/fx/AddinInfo.txt index 98e7a9c..b212b54 100644 --- a/fx/AddinInfo.txt +++ b/fx/AddinInfo.txt @@ -5,7 +5,7 @@ [BINDATA] : "FXADDINror.bin" [DISPNAME] : "CBASIC" [APPNAME] : "@CBASIC" -[VERSION] : "02.32.0000" +[VERSION] : "02.33.0000" [APL_ICON] : "MainIcon.bmp" [MODULE_NUM] : 0 [MOD1_TITLE] : "CBASIC" diff --git a/fx/CBASIC.g1w b/fx/CBASIC.g1w index be8cf04..3dd0172 100644 --- a/fx/CBASIC.g1w +++ b/fx/CBASIC.g1w @@ -1,6 +1,6 @@ [DLSimProject] Name=CBASIC -Version=02.32.0000 +Version=02.33.0000 Model=:fx-9860G.dlm SourcePath=. MemoryPath=INIT diff --git a/fx/CBZ_edit.c b/fx/CBZ_edit.c index 7b9d899..70081cc 100644 --- a/fx/CBZ_edit.c +++ b/fx/CBZ_edit.c @@ -762,8 +762,8 @@ int DumpOpcode( char *SrcBase, int *offset, int *offset_y, int csrPtr, int *pcx, while ( 1 ) { NumOfset=0; // line number offset // for ( y=ymin; y<8; y++ ) { locate(1,y); PrintLine((unsigned char*)" ",21); } -// ML_rectangle( 0, 8*(ymin-1), 127, 55, 0, 0, 0); - ML_clear_vram(); + ML_rectangle( 0, 8*(ymin-1), 127, 55, 0, 0, 0); +// ML_clear_vram(); y=ymin; ofst=(*offset); ofst2=ofst; px=1; ynum=0; @@ -1843,7 +1843,9 @@ unsigned int EditRun(int run){ // run:1 exec run:2 edit case KEY_CTRL_SHIFT: if ( ClipStartPtr > 0 ) { ClipStartPtr = -1 ; // ClipMode cancel + if ( mini == 0 ) break; DumpOpcode( SrcBase, &offset, &offset_y, csrPtr, &pcx, &cy, ClipStartPtr, ClipEndPtr); +// locate((pcx-1+EDITpxNum)/6+1,cy); } if ( SearchMode ) break;; ShiftF6loop: @@ -2230,9 +2232,9 @@ unsigned int EditRun(int run){ // run:1 exec run:2 edit // alphastatus = 0; } } -// } else -// if ( dumpflg==4 ) { -// key=0; + } else + if ( dumpflg==4 ) { + key=0; } } diff --git a/fx/CBZ_file.c b/fx/CBZ_file.c index b4b67c1..b09ebf8 100644 --- a/fx/CBZ_file.c +++ b/fx/CBZ_file.c @@ -3521,7 +3521,7 @@ int fileObjectAlign4e( unsigned int n ){ return n; } // align +4byte int fileObjectAlign4f( unsigned int n ){ return n; } // align +4byte int fileObjectAlign4g( unsigned int n ){ return n; } // align +4byte int fileObjectAlign4h( unsigned int n ){ return n; } // align +4byte -//int fileObjectAlign4i( unsigned int n ){ return n; } // align +4byte +int fileObjectAlign4i( unsigned int n ){ return n; } // align +4byte int fileObjectAlign4j( unsigned int n ){ return n; } // align +4byte int fileObjectAlign4k( unsigned int n ){ return n; } // align +4byte int fileObjectAlign4l( unsigned int n ){ return n; } // align +4byte @@ -3539,32 +3539,32 @@ int fileObjectAlign4w( unsigned int n ){ return n; } // align +4byte int fileObjectAlign4x( unsigned int n ){ return n; } // align +4byte int fileObjectAlign4y( unsigned int n ){ return n; } // align +4byte int fileObjectAlign4z( unsigned int n ){ return n; } // align +4byte -//int fileObjectAlign4A( unsigned int n ){ return n; } // align +4byte +int fileObjectAlign4A( unsigned int n ){ return n; } // align +4byte int fileObjectAlign4B( unsigned int n ){ return n; } // align +4byte int fileObjectAlign4C( unsigned int n ){ return n; } // align +4byte int fileObjectAlign4D( unsigned int n ){ return n; } // align +4byte int fileObjectAlign4E( unsigned int n ){ return n; } // align +4byte int fileObjectAlign4F( unsigned int n ){ return n; } // align +4byte -int fileObjectAlign4G( unsigned int n ){ return n; } // align +4byte -int fileObjectAlign4H( unsigned int n ){ return n; } // align +4byte -int fileObjectAlign4I( unsigned int n ){ return n; } // align +4byte -int fileObjectAlign4J( unsigned int n ){ return n; } // align +4byte -int fileObjectAlign4K( unsigned int n ){ return n; } // align +4byte -int fileObjectAlign4L( unsigned int n ){ return n; } // align +4byte -int fileObjectAlign4M( unsigned int n ){ return n; } // align +4byte -int fileObjectAlign4N( unsigned int n ){ return n; } // align +4byte -int fileObjectAlign4O( unsigned int n ){ return n; } // align +4byte -int fileObjectAlign4P( unsigned int n ){ return n; } // align +4byte -int fileObjectAlign4Q( unsigned int n ){ return n; } // align +4byte -int fileObjectAlign4R( unsigned int n ){ return n; } // align +4byte -int fileObjectAlign4S( unsigned int n ){ return n; } // align +4byte -int fileObjectAlign4T( unsigned int n ){ return n; } // align +4byte -int fileObjectAlign4U( unsigned int n ){ return n; } // align +4byte -int fileObjectAlign4V( unsigned int n ){ return n; } // align +4byte -int fileObjectAlign4W( unsigned int n ){ return n; } // align +4byte -int fileObjectAlign4X( unsigned int n ){ return n; } // align +4byte -int fileObjectAlign4Y( unsigned int n ){ return n; } // align +4byte -int fileObjectAlign4Z( unsigned int n ){ return n; } // align +4byte +//int fileObjectAlign4G( unsigned int n ){ return n; } // align +4byte +//int fileObjectAlign4H( unsigned int n ){ return n; } // align +4byte +//int fileObjectAlign4I( unsigned int n ){ return n; } // align +4byte +//int fileObjectAlign4J( unsigned int n ){ return n; } // align +4byte +//int fileObjectAlign4K( unsigned int n ){ return n; } // align +4byte +//int fileObjectAlign4L( unsigned int n ){ return n; } // align +4byte +//int fileObjectAlign4M( unsigned int n ){ return n; } // align +4byte +//int fileObjectAlign4N( unsigned int n ){ return n; } // align +4byte +//int fileObjectAlign4O( unsigned int n ){ return n; } // align +4byte +//int fileObjectAlign4P( unsigned int n ){ return n; } // align +4byte +//int fileObjectAlign4Q( unsigned int n ){ return n; } // align +4byte +//int fileObjectAlign4R( unsigned int n ){ return n; } // align +4byte +//int fileObjectAlign4S( unsigned int n ){ return n; } // align +4byte +//int fileObjectAlign4T( unsigned int n ){ return n; } // align +4byte +//int fileObjectAlign4U( unsigned int n ){ return n; } // align +4byte +//int fileObjectAlign4V( unsigned int n ){ return n; } // align +4byte +//int fileObjectAlign4W( unsigned int n ){ return n; } // align +4byte +//int fileObjectAlign4X( unsigned int n ){ return n; } // align +4byte +//int fileObjectAlign4Y( unsigned int n ){ return n; } // align +4byte +//int fileObjectAlign4Z( unsigned int n ){ return n; } // align +4byte //int fileObjectAlign4AA( unsigned int n ){ return n; } // align +4byte //int fileObjectAlign4BB( unsigned int n ){ return n; } // align +4byte //int fileObjectAlign4CC( unsigned int n ){ return n; } // align +4byte diff --git a/fx/CBZ_inp.c b/fx/CBZ_inp.c index 078cb45..5a62a38 100644 --- a/fx/CBZ_inp.c +++ b/fx/CBZ_inp.c @@ -2950,6 +2950,7 @@ int InputStrSubC(int x, int y, int width, int ptrX, char* buffer, int MaxStrlen, CommandType=CMD_MENU; CommandPage=0; } else { key=SelectOpcode5800P( 0 ); + F3ja: if ( ( pallet_mode ) && ( alpha_mode ) ) if ( alphalock == 0 ) PutAlphamode1(CursorStyle); } } @@ -2987,6 +2988,10 @@ int InputStrSubC(int x, int y, int width, int ptrX, char* buffer, int MaxStrlen, break; case KEY_CTRL_SHIFT: + if ( ClipStartPtr >= 0 ) { + ClipStartPtr = -1 ; // ClipMode cancel + break; + } alphalock_bk = alphalock; alphalock = 0 ; FkeyClearAll(); @@ -3062,7 +3067,8 @@ int InputStrSubC(int x, int y, int width, int ptrX, char* buffer, int MaxStrlen, CommandType=CMD_PRGM; CommandPage=0; } else { key=SelectOpcode( CMDLIST_PRGM, 0 ); - if ( ( pallet_mode ) && ( alpha_mode ) ) if ( alphalock == 0 ) PutAlphamode1(CursorStyle); + goto F3ja; +// if ( ( pallet_mode ) && ( alpha_mode ) ) if ( alphalock == 0 ) PutAlphamode1(CursorStyle); } break; case KEY_CHAR_3: @@ -3368,10 +3374,12 @@ complex InputNumC_CB2(int x, int y, int width, int MaxStrlen, char* SPC, int REV return InputNumC_CB_sub( x, y, width, MaxStrlen, strlenOp((char*)ExpBuffer), SPC, REV, defaultNum); } //---------------------------------------------------------------------------------------------- align dummy -//int InpObjectAlign4g( unsigned int n ){ return n; } // align +4byte -//int InpObjectAlign4h( unsigned int n ){ return n; } // align +4byte -//int InpObjectAlign4i( unsigned int n ){ return n; } // align +4byte -//int InpObjectAlign4j( unsigned int n ){ return n; } // align +4byte -//int InpObjectAlign4k( unsigned int n ){ return n; } // align +4byte -//int InpObjectAlign4l( unsigned int n ){ return n; } // align +4byte -//int InpObjectAlign4m( unsigned int n ){ return n; } // align +4byte +int InpObjectAlign4g( unsigned int n ){ return n; } // align +4byte +int InpObjectAlign4h( unsigned int n ){ return n; } // align +4byte +int InpObjectAlign4i( unsigned int n ){ return n; } // align +4byte +int InpObjectAlign4j( unsigned int n ){ return n; } // align +4byte +int InpObjectAlign4k( unsigned int n ){ return n; } // align +4byte +int InpObjectAlign4l( unsigned int n ){ return n; } // align +4byte +int InpObjectAlign4m( unsigned int n ){ return n; } // align +4byte +int InpObjectAlign4n( unsigned int n ){ return n; } // align +4byte +int InpObjectAlign4o( unsigned int n ){ return n; } // align +4byte diff --git a/fx/CBZ_setup.c b/fx/CBZ_setup.c index e98d563..e09aec5 100644 --- a/fx/CBZ_setup.c +++ b/fx/CBZ_setup.c @@ -29,8 +29,8 @@ int selectMatrix=0; int StackPtr; -const char VerMSG[]="C.Basic v2.32\xE6\x41"; -#define VERSION 232 +const char VerMSG[]="C.Basic v2.33\xE6\x41"; +#define VERSION 233 //--------------------------------------------------------------------------------------------- void GetMemFreeStr10( char *buffer );