QB64/QB64-PE
QB64/QB64-PE
1
1
Fork 0
mirror of https://github.com/QB64-Phoenix-Edition/QB64pe.git synced 2024-07-03 13:31:23 +00:00
Code Issues Releases Wiki Activity

Merge pull request #156 from lstricklan/development

Browse source 
Fix writing to SCRN when opened as a file
This commit is contained in:
Fellippe Heitor 2021-03-30 13:49:26 -03:00 committed by GitHub
parent 8e4cc6c280 445f11fd4c
commit ec747a53c2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
internal/c/libqb.cpp
View file

@ -15796,8 +15796,11 @@ void sub_put2(int32 i,int64 offset,void *element,int32 passed){
//returns a string to advance to the horizontal position "pos" on either //returns a string to advance to the horizontal position "pos" on either
//the current line or the next line. //the current line or the next line.
static int32 w,div,cursor; static int32 w,div,cursor;
static int32 cr_size; // a local in case file is SCRN
cr_size = tab_spc_cr_size; // init to caller's value
//calculate width in spaces & current position //calculate width in spaces & current position
if (tab_spc_cr_size==2){ if (cr_size==2){
//print to file //print to file
div=1; div=1;
w=2147483647; w=2147483647;
@ -15808,9 +15811,14 @@ void sub_put2(int32 i,int64 offset,void *element,int32 passed){
if (i<0) goto invalid_file;//TCP/IP unsupported if (i<0) goto invalid_file;//TCP/IP unsupported
if (gfs_fileno_valid(i)!=1) goto invalid_file;//Bad file name or number if (gfs_fileno_valid(i)!=1) goto invalid_file;//Bad file name or number
i=gfs_fileno[i];//convert fileno to gfs index i=gfs_fileno[i];//convert fileno to gfs index
if (gfs_file[i].scrn == 1) { // going to screen, change the cr size
cr_size = 1;
} else {
cursor=gfs_file[i].column; cursor=gfs_file[i].column;
}
invalid_file:; invalid_file:;
}else{ }
if (cr_size == 1) {
//print to surface //print to surface
if (write_page->text){ if (write_page->text){
w=write_page->width; w=write_page->width;
@ -15840,7 +15848,7 @@ void sub_put2(int32 i,int64 offset,void *element,int32 passed){
size=0; spaces=0; cr=0; size=0; spaces=0; cr=0;
if (cursor>pos){ if (cursor>pos){
cr=1; cr=1;
size=tab_spc_cr_size; size=cr_size;
spaces=pos/div; if (pos%div) spaces++; spaces=pos/div; if (pos%div) spaces++;
spaces--;//don't put a space on the dest position spaces--;//don't put a space on the dest position
size+=spaces; size+=spaces;
@ -15851,8 +15859,8 @@ void sub_put2(int32 i,int64 offset,void *element,int32 passed){
//build custom string //build custom string
tqbs=qbs_new(size,1); tqbs=qbs_new(size,1);
if (cr){ if (cr){
tqbs->chr[0]=13; if (tab_spc_cr_size==2) tqbs->chr[1]=10; tqbs->chr[0]=13; if (cr_size==2) tqbs->chr[1]=10;
memset(&tqbs->chr[tab_spc_cr_size],32,spaces); memset(&tqbs->chr[cr_size],32,spaces);
}else{ }else{
memset(tqbs->chr,32,spaces); memset(tqbs->chr,32,spaces);
} }