Update of /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fConsole
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21248/extsrc/w32fConsole
Modified Files:
Term.cpp
Log Message:
Rod: Removed CS_HREDRAW and CS_VREDRAW, an extra character has to be output in Paint() to redraw part of character under the scrollbar.
Index: Term.cpp
===================================================================
RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fConsole/Term.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Term.cpp 20 May 2006 08:06:03 -0000 1.7
--- Term.cpp 21 May 2006 11:05:21 -0000 1.8
***************
*** 490,494 ****
// don't let us type under the scrollbar
! width -= GetSystemMetrics( SM_CXHSCROLL );
int newrows = min( max (height / charH, 1), maxrows );
--- 490,494 ----
// don't let us type under the scrollbar
! width -= ( GetSystemMetrics( SM_CXHSCROLL ) + 1 );
int newrows = min( max (height / charH, 1), maxrows );
***************
*** 788,792 ****
{
if (((i + rowoff) < hlstlin) || ((i + rowoff) > hledlin))
! TextOut (hdc, 1, i * charH, screen + ((i + rowoff) * maxcols), cols);
else
{
--- 788,792 ----
{
if (((i + rowoff) < hlstlin) || ((i + rowoff) > hledlin))
! TextOut (hdc, 1, i * charH, screen + ((i + rowoff) * maxcols), cols + 1);
else
{
***************
*** 805,814 ****
SetTextColor(hdc, theFg);
TextOut (hdc, 1+(charW*hledcol), i * charH, screen +
! ((i + rowoff) * maxcols) + hledcol, cols-hledcol);
}
else // else put out remainder of starting line reversed
{
TextOut (hdc, 1+(charW*hlstcol), i * charH, screen +
! ((i + rowoff) * maxcols)+ hlstcol, cols-hlstcol);
SetBkColor(hdc, theBg);
SetTextColor(hdc, theFg);
--- 805,814 ----
SetTextColor(hdc, theFg);
TextOut (hdc, 1+(charW*hledcol), i * charH, screen +
! ((i + rowoff) * maxcols) + hledcol, cols-hledcol + 1);
}
else // else put out remainder of starting line reversed
{
TextOut (hdc, 1+(charW*hlstcol), i * charH, screen +
! ((i + rowoff) * maxcols)+ hlstcol, cols-hlstcol + 1);
SetBkColor(hdc, theBg);
SetTextColor(hdc, theFg);
***************
*** 826,830 ****
SetTextColor(hdc, theFg);
TextOut (hdc, 1+(charW*hledcol), i * charH, screen +
! ((i + rowoff) * maxcols) + hledcol, cols-hledcol);
}
else // if not ending line either
--- 826,830 ----
SetTextColor(hdc, theFg);
TextOut (hdc, 1+(charW*hledcol), i * charH, screen +
! ((i + rowoff) * maxcols) + hledcol, cols-hledcol + 1);
}
else // if not ending line either
***************
*** 833,837 ****
SetTextColor(hdc, theBg);
TextOut (hdc, 1, i * charH, screen +
! ((i + rowoff) * maxcols), cols);
SetBkColor(hdc, theBg);
SetTextColor(hdc, theFg);
--- 833,837 ----
SetTextColor(hdc, theBg);
TextOut (hdc, 1, i * charH, screen +
! ((i + rowoff) * maxcols), cols + 1);
SetBkColor(hdc, theBg);
SetTextColor(hdc, theFg);
***************
*** 1331,1335 ****
// Register console window class
! wndclass.style = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS | CS_OWNDC;
wndclass.lpfnWndProc = ConsoleWndProc;
wndclass.cbClsExtra = 0;
--- 1331,1335 ----
// Register console window class
! wndclass.style = CS_DBLCLKS | CS_OWNDC;
wndclass.lpfnWndProc = ConsoleWndProc;
wndclass.cbClsExtra = 0;
***************
*** 1348,1352 ****
hWndMain = CreateWindow( MainClassName, // window class name
WindowTitle, // window caption
! WS_OVERLAPPEDWINDOW, // window style
pos.left, // window x-position
pos.top, // window y-position
--- 1348,1352 ----
hWndMain = CreateWindow( MainClassName, // window class name
WindowTitle, // window caption
! WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN, // window style
pos.left, // window x-position
pos.top, // window y-position
|
