Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Support for optional paramter for an image handle to CLS #401

Merged
merged 6 commits into from
Oct 22, 2023
Merged

Add Support for optional paramter for an image handle to CLS #401

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9854955
Add Support for optional paramter for an image handle to CLS
SteveMcNeill Oct 18, 2023
7345839
missing call to sub__dest??
SteveMcNeill Oct 18, 2023
5a063f4
check for which optional param is passed to CLS
SteveMcNeill Oct 18, 2023
2a6cc27
rework CLS specialformat so 2nd comma is required if using the 3rd p…
SteveMcNeill Oct 18, 2023
61e0ef7
swap types to proper order
SteveMcNeill Oct 18, 2023
5cf574e
Merge branch 'main' into main
SteveMcNeill Oct 19, 2023
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
9 changes: 9 additions & 0 deletions internal/c/libqb.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1195,6 +1195,7 @@ void validatepage(int32);
void sub__dest(int32);
void sub__source(int32);
int32 func__printwidth(qbs *, int32, int32);
void sub_clsDest(int32, uint32, int32, int32);
void sub_cls(int32, uint32, int32);
void qbs_print(qbs *, int32);
int32 func__copyimage(int32 i, int32 mode, int32 passed);
Expand Down Expand Up @@ -14684,6 +14685,14 @@ void qbg_sub_view(int32 x1, int32 y1, int32 x2, int32 y2, int32 fillcolor, int32
}

void qbg_sub_locate(int32 row, int32 column, int32 cursor, int32 start, int32 stop, int32 passed);

void sub_clsDest(int32 method, uint32 use_color, int32 dest, int32 passed) {
int32 tempDest;
tempDest = func__dest();
sub_cls(method, use_color, passed);
sub__dest(tempDest);
}

void sub_cls(int32 method, uint32 use_color, int32 passed) {
if (new_error)
return;
Expand Down
1 change: 1 addition & 0 deletions internal/c/qbx.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,7 @@ extern void qbg_sub_window(float x1, float y1, float x2, float y2,
extern void qbg_sub_view_print(int32 topline, int32 bottomline, int32 passed);
extern void qbg_sub_view(int32 x1, int32 y1, int32 x2, int32 y2,
int32 fillcolor, int32 bordercolor, int32 passed);
extern void sub_clsDest(int32 method, uint32 use_color, int32 dest, int32 passed);
extern void sub_cls(int32 method, uint32 use_color, int32 passed);
extern void qbg_sub_locate(int32 row, int32 column, int32 cursor, int32 start,
int32 stop, int32 passed);
Expand Down
10 changes: 5 additions & 5 deletions source/subs_functions/subs_functions.bas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2833,11 +2833,11 @@ regid
clearid
id.n = "Cls"
id.subfunc = 2
id.callname = "sub_cls"
id.args = 2
id.arg = MKL$(LONGTYPE - ISPOINTER) + MKL$(ULONGTYPE - ISPOINTER)
id.specialformat = "[?][,?]"
id.hr_syntax = "CLS [method%] [, bgColor&]"
id.callname = "sub_clsDest"
id.args = 3
id.arg = MKL$(LONGTYPE - ISPOINTER) + MKL$(LONGTYPE - ISPOINTER) + MKL$(ULONGTYPE - ISPOINTER)
id.specialformat = "[?][,?][,?]"
id.hr_syntax = "CLS [method%] [, bgColor&] [, dest&]"
regid

clearid
Expand Down