zcy
/
solvespace
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify the text window in SolveSpace; better scrolling behaviour, 

and my concept is more like a web page than like a command line.

[git-p4: depot-paths = "//depot/solvespace/": change = 1659]
solver
Jonathan Westhues 2008-04-09 01:35:09 -08:00
parent 9c2a8a08dc
commit 3357446278
3 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cmdline.cpp
View File

@ -25,7 +25,6 @@ void TextWindow::ClearScreen(void) {
meta[i][j].link = NOT_A_LINK; meta[i][j].link = NOT_A_LINK;
} }
} }
row0 = 0;
rows = 0; rows = 0;
} }
@ -33,14 +32,12 @@ void TextWindow::Printf(char *fmt, ...) {
va_list vl; va_list vl;
va_start(vl, fmt); va_start(vl, fmt);
if(rows >= MAX_ROWS) return;
int r, c; int r, c;
if(rows < MAX_ROWS) { r = rows;
r = rows; rows++;
rows++;
} else {
r = row0;
row0++;
}
for(c = 0; c < MAX_COLS; c++) { for(c = 0; c < MAX_COLS; c++) {
text[r][c] = ' '; text[r][c] = ' ';
meta[r][c].link = NOT_A_LINK; meta[r][c].link = NOT_A_LINK;

2
ui.h
View File

@ -42,7 +42,7 @@ public:
LinkFunction *f; LinkFunction *f;
} meta[MAX_ROWS][MAX_COLS]; } meta[MAX_ROWS][MAX_COLS];
int row0, rows; int rows;
void Init(void); void Init(void);
void Printf(char *fmt, ...); void Printf(char *fmt, ...);

11
win32/w32main.cpp
View File

@ -64,6 +64,9 @@ static void PaintTextWnd(HDC hdc)
rows--; rows--;
TextWndRows = rows; TextWndRows = rows;
TextWndScrollPos = min(TextWndScrollPos, SS.TW.rows - rows);
TextWndScrollPos = max(TextWndScrollPos, 0);
// Let's set up the scroll bar first // Let's set up the scroll bar first
SCROLLINFO si; SCROLLINFO si;
memset(&si, 0, sizeof(si)); memset(&si, 0, sizeof(si));
@ -79,22 +82,20 @@ static void PaintTextWnd(HDC hdc)
for(r = TextWndScrollPos; r < (TextWndScrollPos+rows); r++) { for(r = TextWndScrollPos; r < (TextWndScrollPos+rows); r++) {
if(r < 0) continue; if(r < 0) continue;
if(r >= SS.TW.MAX_ROWS) continue; if(r >= SS.TW.MAX_ROWS) continue;
int rr = (r + SS.TW.row0);
while(rr >= SS.TW.MAX_ROWS) rr -= SS.TW.MAX_ROWS;
for(c = 0; c < SS.TW.MAX_COLS; c++) { for(c = 0; c < SS.TW.MAX_COLS; c++) {
char v = '0' + (c % 10); char v = '0' + (c % 10);
int color = SS.TW.meta[rr][c].color; int color = SS.TW.meta[r][c].color;
SetTextColor(backDc, SS.TW.colors[color].fg); SetTextColor(backDc, SS.TW.colors[color].fg);
SetBkColor(backDc, SS.TW.colors[color].bg); SetBkColor(backDc, SS.TW.colors[color].bg);
if(SS.TW.meta[rr][c].link) { if(SS.TW.meta[r][c].link) {
SelectObject(backDc, LinkFont); SelectObject(backDc, LinkFont);
} else { } else {
SelectObject(backDc, FixedFont); SelectObject(backDc, FixedFont);
} }
TextOut(backDc, 4 + c*TEXT_WIDTH, (r-TextWndScrollPos)*TEXT_HEIGHT, TextOut(backDc, 4 + c*TEXT_WIDTH, (r-TextWndScrollPos)*TEXT_HEIGHT,
(char *)&(SS.TW.text[rr][c]), 1); (char *)&(SS.TW.text[r][c]), 1);
} }
} }