fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2009-04-11 21:53 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)

Browse Source 
* harbour/contrib/gtqtc/gtqtc.cpp
  * harbour/contrib/gtqtc/gtqtc.h
  * harbour/contrib/gtqtc/qtconsolearea.cpp
  * harbour/contrib/gtqtc/qtmainwindow.cpp
    ! More fixes. Now we get background colors as in .prg.
      It is a bit puzzling why I do not get text colors.
This commit is contained in:
Pritpal Bedi
2009-04-12 04:56:52 +00:00
parent c427c78d14
commit beac47e956
5 changed files with 81 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
harbour/ChangeLog
View File

@@ -8,6 +8,14 @@
2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
*/
2009-04-11 21:53 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
* harbour/contrib/gtqtc/gtqtc.cpp
* harbour/contrib/gtqtc/gtqtc.h
* harbour/contrib/gtqtc/qtconsolearea.cpp
* harbour/contrib/gtqtc/qtmainwindow.cpp
! More fixes. Now we get background colors as in .prg.
It is a bit puzzling why I do not get text colors.
2009-04-11 12:51 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
+ harbour/contrib/gtqtc
+ harbour/contrib/gtqtc/gtqtc.cpp

143
harbour/contrib/gtqtc/gtqtc.cpp
View File

@@ -230,22 +230,22 @@ static PHB_GTWVT hb_gt_wvt_New( PHB_GT pGT, HINSTANCE hInstance, int iCmdShow )
pWVT->ROWS = WVT_DEFAULT_ROWS;
pWVT->COLS = WVT_DEFAULT_COLS;
pWVT->COLORS[ 0] = BLACK;
pWVT->COLORS[ 1] = BLUE;
pWVT->COLORS[ 2] = GREEN;
pWVT->COLORS[ 3] = CYAN;
pWVT->COLORS[ 4] = RED;
pWVT->COLORS[ 5] = MAGENTA;
pWVT->COLORS[ 6] = BROWN;
pWVT->COLORS[ 7] = WHITE;
pWVT->COLORS[ 8] = LIGHT_GRAY;
pWVT->COLORS[ 9] = BRIGHT_BLUE;
pWVT->COLORS[10] = BRIGHT_GREEN;
pWVT->COLORS[11] = BRIGHT_CYAN;
pWVT->COLORS[12] = BRIGHT_RED;
pWVT->COLORS[13] = BRIGHT_MAGENTA;
pWVT->COLORS[14] = YELLOW;
pWVT->COLORS[15] = BRIGHT_WHITE;
pWVT->COLORS[ 0] = C_BLACK;
pWVT->COLORS[ 1] = C_BLUE;
pWVT->COLORS[ 2] = C_GREEN;
pWVT->COLORS[ 3] = C_CYAN;
pWVT->COLORS[ 4] = C_RED;
pWVT->COLORS[ 5] = C_MAGENTA;
pWVT->COLORS[ 6] = C_BROWN;
pWVT->COLORS[ 7] = C_WHITE;
pWVT->COLORS[ 8] = C_LIGHT_GRAY;
pWVT->COLORS[ 9] = C_BRIGHT_BLUE;
pWVT->COLORS[10] = C_BRIGHT_GREEN;
pWVT->COLORS[11] = C_BRIGHT_CYAN;
pWVT->COLORS[12] = C_BRIGHT_RED;
pWVT->COLORS[13] = C_BRIGHT_MAGENTA;
pWVT->COLORS[14] = C_YELLOW;
pWVT->COLORS[15] = C_BRIGHT_WHITE;
/* THESE are the default font parameters, if not changed by user */
pWVT->PTEXTSIZE.x = WVT_DEFAULT_FONT_WIDTH;
@@ -1599,10 +1599,12 @@ static BOOL hb_gt_wvt_CreateConsoleWindow( PHB_GTWVT pWVT )
hb_gt_wvt_InitWindow( pWVT, pWVT->ROWS, pWVT->COLS );
/* Set icon */
#if 0
if( pWVT->hIcon )
{
//pWVT->qWnd->setWindowIcon( pWVT->hIcon );
pWVT->qWnd->setWindowIcon( pWVT->hIcon );
}
#endif
/* Set default window title */
{
@@ -1776,7 +1778,7 @@ static const char * hb_gt_wvt_Version( PHB_GT pGT, int iType )
if( iType == 0 )
return HB_GT_DRVNAME( HB_GT_NAME );
return "Harbour Terminal: Windows GUI console (WVT)";
return "Harbour Terminal: Multi-Platform QT based GUI console (QTC)";
}
/* ********************************************************************** */
@@ -2140,42 +2142,31 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
}
break;
#if 0
case HB_GTI_DESKTOPWIDTH:
{
RECT rDesk;
HWND hDesk = GetDesktopWindow();
GetWindowRect( hDesk, &rDesk );
pInfo->pResult = hb_itemPutNI( pInfo->pResult, rDesk.right - rDesk.left );
QDesktopWidget *qDesk = new QDesktopWidget();
pInfo->pResult = hb_itemPutNI( pInfo->pResult, qDesk->width() );
break;
}
case HB_GTI_DESKTOPHEIGHT:
{
RECT rDesk;
HWND hDesk = GetDesktopWindow();
GetWindowRect( hDesk, &rDesk );
pInfo->pResult = hb_itemPutNI( pInfo->pResult, rDesk.bottom - rDesk.top );
QDesktopWidget *qDesk = new QDesktopWidget();
pInfo->pResult = hb_itemPutNI( pInfo->pResult, qDesk->height() );
break;
}
case HB_GTI_DESKTOPCOLS:
{
RECT rDesk;
HWND hDesk = GetDesktopWindow();
GetClientRect( hDesk, &rDesk );
pInfo->pResult = hb_itemPutNI( pInfo->pResult,
( rDesk.right - rDesk.left ) / pWVT->PTEXTSIZE.x );
QDesktopWidget *qDesk = new QDesktopWidget();
pInfo->pResult = hb_itemPutNI( pInfo->pResult, qDesk->width() / pWVT->PTEXTSIZE.x );
break;
}
case HB_GTI_DESKTOPROWS:
{
RECT rDesk;
HWND hDesk = GetDesktopWindow();
GetClientRect( hDesk, &rDesk );
pInfo->pResult = hb_itemPutNI( pInfo->pResult,
( rDesk.bottom - rDesk.top ) / pWVT->PTEXTSIZE.y );
QDesktopWidget *qDesk = new QDesktopWidget();
pInfo->pResult = hb_itemPutNI( pInfo->pResult, qDesk->height() / pWVT->PTEXTSIZE.y );
break;
}
#endif
case HB_GTI_WINTITLE:
if( pWVT->hWnd )
{
@@ -2223,32 +2214,19 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
pWVT->boxCDP = cdpBox;
}
break;
#if 0
case HB_GTI_ICONFILE:
{
if( ( hb_itemType( pInfo->pNewVal ) & HB_IT_STRING ) )
{
HICON hIconToFree = ( pWVT->hIcon && pWVT->bIconToFree ) ? pWVT->hIcon : NULL;
LPTSTR lpImage;
lpImage = HB_TCHAR_CONVTO( hb_itemGetCPtr( pInfo->pNewVal ) );
pWVT->bIconToFree = TRUE;
pWVT->hIcon = ( HICON ) LoadImage( ( HINSTANCE ) NULL, lpImage,
IMAGE_ICON, 0, 0, LR_LOADFROMFILE );
HB_TCHAR_FREE( lpImage );
if( pWVT->hWnd )
if( pWVT->qWnd )
{
SendNotifyMessage( pWVT->hWnd, WM_SETICON, ICON_SMALL, ( LPARAM ) pWVT->hIcon ); /* Set Title Bar Icon */
SendNotifyMessage( pWVT->hWnd, WM_SETICON, ICON_BIG , ( LPARAM ) pWVT->hIcon ); /* Set Task List Icon */
pWVT->qWnd->setWindowIcon( QIcon( QString( hb_itemGetCPtr( pInfo->pNewVal ) ) ) );
}
if( hIconToFree )
DestroyIcon( hIconToFree );
}
pInfo->pResult = hb_itemPutNInt( pInfo->pResult, ( HB_PTRDIFF ) pWVT->hIcon );
break;
}
#if 0
case HB_GTI_ICONRES:
{
if( hb_itemType( pInfo->pNewVal ) & HB_IT_STRING )
@@ -2373,21 +2351,14 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
pWVT->bResizable = bNewValue;
if( pWVT->hWnd )
{
#if (defined(_MSC_VER) && (_MSC_VER <= 1200 || defined(HB_OS_WIN_CE)) || defined(__DMC__)) && !defined(HB_ARCH_64BIT)
LONG style;
#else
LONG_PTR style;
#endif
if( pWVT->bResizable )
style = WS_OVERLAPPED|WS_CAPTION|WS_SYSMENU|WS_MINIMIZEBOX|WS_MAXIMIZEBOX|WS_THICKFRAME;
else
style = WS_OVERLAPPED|WS_CAPTION|WS_SYSMENU|WS_MINIMIZEBOX|WS_BORDER;
#if (defined(_MSC_VER) && (_MSC_VER <= 1200 || defined(HB_OS_WIN_CE)) || defined(__DMC__)) && !defined(HB_ARCH_64BIT)
SetWindowLong( pWVT->hWnd, GWL_STYLE, style );
#else
SetWindowLongPtr( pWVT->hWnd, GWL_STYLE, style );
#endif
SetWindowPos( pWVT->hWnd, NULL, 0, 0, 0, 0,
SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_DEFERERASE );
ShowWindow( pWVT->hWnd, SW_HIDE );
@@ -2396,7 +2367,7 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
}
}
break;
#endif
case HB_GTI_SELECTCOPY:
pInfo->pResult = hb_itemPutL( pInfo->pResult, pWVT->bSelectCopy );
@@ -2406,6 +2377,7 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
if( hb_itemGetCLen( pInfo->pNewVal ) )
{
#if 0
HMENU hSysMenu = pWVT->hWnd ? GetSystemMenu( pWVT->hWnd, FALSE ) : NULL;
if( hSysMenu || !pWVT->hWnd )
{
@@ -2413,17 +2385,10 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
hb_xfree( pWVT->pszSelectCopy );
pWVT->pszSelectCopy = hb_strdup( hb_itemGetCPtr( pInfo->pNewVal ) );
pWVT->bSelectCopy = TRUE;
#if !defined(HB_OS_WIN_CE) /* WinCE does not support ModifyMenu */
if( hSysMenu )
{
LPTSTR buffer;
buffer = HB_TCHAR_CONVTO( pWVT->pszSelectCopy );
ModifyMenu( hSysMenu, SYS_EV_MARK, MF_BYCOMMAND | MF_STRING | MF_ENABLED, SYS_EV_MARK, buffer );
HB_TCHAR_FREE( buffer );
}
#endif
}
#endif
pWVT->pszSelectCopy = hb_strdup( hb_itemGetCPtr( pInfo->pNewVal ) );
pWVT->bSelectCopy = TRUE;
}
}
else if( pInfo->pNewVal )
@@ -2433,12 +2398,15 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
{
if( pWVT->hWnd )
{
#if 0
HMENU hSysMenu = GetSystemMenu( pWVT->hWnd, FALSE );
if( hSysMenu )
{
EnableMenuItem( hSysMenu, SYS_EV_MARK, MF_BYCOMMAND | ( bNewValue ? MF_ENABLED : MF_GRAYED ) );
pWVT->bSelectCopy = bNewValue;
}
#endif
pWVT->bSelectCopy = bNewValue;
}
else
pWVT->bSelectCopy = bNewValue;
@@ -2453,21 +2421,24 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
BOOL bNewValue = hb_itemGetL( pInfo->pNewVal );
if( bNewValue != pWVT->bClosable )
{
if( pWVT->hWnd )
if( pWVT->qWnd )
{
#if 0
HMENU hSysMenu = GetSystemMenu( pWVT->hWnd, FALSE );
if( hSysMenu )
{
EnableMenuItem( hSysMenu, SC_CLOSE, MF_BYCOMMAND | ( bNewValue ? MF_ENABLED : MF_GRAYED ) );
pWVT->bClosable = bNewValue;
}
#endif
pWVT->bClosable = bNewValue;
}
else
pWVT->bClosable = bNewValue;
}
}
break;
#endif
case HB_GTI_PALETTE:
if( hb_itemType( pInfo->pNewVal ) & HB_IT_NUMERIC )
{
@@ -2475,11 +2446,11 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
if( iIndex >= 0 && iIndex < 16 )
{
pInfo->pResult = hb_itemPutNL( pInfo->pResult, pWVT->qWnd->consoleArea->COLORS[ iIndex ] );
pInfo->pResult = hb_itemPutNL( pInfo->pResult, pWVT->COLORS[ iIndex ] );
if( hb_itemType( pInfo->pNewVal2 ) & HB_IT_NUMERIC )
{
pWVT->qWnd->consoleArea->COLORS[ iIndex ] = ( Qt::GlobalColor ) hb_itemGetNL( pInfo->pNewVal2 );
pWVT->COLORS[ iIndex ] = hb_itemGetNL( pInfo->pNewVal2 );
if( pWVT->hWnd )
HB_GTSELF_EXPOSEAREA( pWVT->pGT, 0, 0, pWVT->ROWS, pWVT->COLS );
@@ -2495,14 +2466,14 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
}
hb_arrayNew( pInfo->pResult, 16 );
for( i = 0; i < 16; i++ )
hb_arraySetNL( pInfo->pResult, i + 1, pWVT->qWnd->consoleArea->COLORS[ i ] );
hb_arraySetNL( pInfo->pResult, i + 1, pWVT->COLORS[ i ] );
if( hb_itemType( pInfo->pNewVal ) & HB_IT_ARRAY )
{
if( hb_arrayLen( pInfo->pNewVal ) == 16 )
{
for( i = 0; i < 16; i++ )
pWVT->qWnd->consoleArea->COLORS[ i ] = ( Qt::GlobalColor ) hb_arrayGetNL( pInfo->pNewVal, i + 1 );
pWVT->COLORS[ i ] = hb_arrayGetNL( pInfo->pNewVal, i + 1 );
if( pWVT->hWnd )
HB_GTSELF_EXPOSEAREA( pWVT->pGT, 0, 0, pWVT->ROWS, pWVT->COLS );
@@ -2518,7 +2489,7 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
pWVT->ResizeMode = hb_itemGetNI( pInfo->pNewVal );
}
break;
#if 0
case HB_GTI_SETPOS_XY:
case HB_GTI_SETPOS_ROWCOL:
if( pWVT->hWnd && ( hb_itemType( pInfo->pNewVal ) & HB_IT_NUMERIC ) &&
@@ -2538,15 +2509,10 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
x = hb_itemGetNI( pInfo->pNewVal );
y = hb_itemGetNI( pInfo->pNewVal2 );
}
hb_retl( SetWindowPos( pWVT->hWnd, NULL,
x,
y,
rect.right - rect.left,
rect.bottom - rect.top,
SWP_NOSIZE | SWP_NOZORDER ) );
pWVT->qWnd->move( x,y );
}
break;
#endif
default:
return HB_GTSUPER_INFO( pGT, iType, pInfo );
}
@@ -2576,7 +2542,6 @@ static BOOL hb_gt_FuncInit( PHB_GT_FUNCS pFuncTable )
pFuncTable->MouseGetPos = hb_gt_wvt_mouse_GetPos;
pFuncTable->MouseButtonState = hb_gt_wvt_mouse_ButtonState;
pFuncTable->MouseCountButton = hb_gt_wvt_mouse_CountButton;
//pFuncTable->MouseCountButton = MainWindow::someFunc;
return TRUE;
}

18
harbour/contrib/gtqtc/gtqtc.h
View File

@@ -60,6 +60,7 @@
#include <QtCore/QList>
#include <QtGui/QApplication>
#include <QtGui/QMainWindow>
#include <QtGui/QDesktopWidget>
#include <QtGui/QWidget>
#include <QtGui/QFont>
#include <QtGui/QPainter>
@@ -93,8 +94,8 @@
#endif
#define WVT_DEFAULT_FONT_NAME "Courier New"
#define QQRGB( r,g,b ) ( ( Qt::GlobalColor ) ( ( r ) + ( g * 256 ) + ( b * 256 * 256 ) ) )
//#define QQRGB( r,g,b ) ( QColor( r,g,b ) )
//#define QQRGB( r,g,b ) ( ( QRgb ) ( ( r ) + ( g * 256 ) + ( b * 256 * 256 ) ) )
#define QQRGB( r,g,b ) ( qRgb( r,g,b ) )
#define C_BLACK RGB( 0x0 ,0x0 ,0x0 )
#define C_BLUE RGB( 0x0 ,0x0 ,0x85 )
@@ -168,6 +169,11 @@
#define SYS_EV_MARK 1000
void hb_ToOutDebug( const char * sTraceMsg, ... );
void hbqt_exit( PHB_GT );
/*----------------------------------------------------------------------*/
class ConsoleArea : public QWidget
@@ -188,7 +194,8 @@ public:
QColor penColor() const { return myPenColor; }
int penWidth() const { return myPenWidth; }
Qt::GlobalColor COLORS[ 16 ];
//Qt::GlobalColor COLORS[ 16 ];
QRgb COLORS[ 16 ];
//QColor COLORS[ 16 ];
void sizeByFont(void);
@@ -219,9 +226,6 @@ private:
int fontWidth;
};
void hb_ToOutDebug( const char * sTraceMsg, ... );
void hbqt_exit( PHB_GT );
/*----------------------------------------------------------------------*/
class MainWindow : public QMainWindow
@@ -278,7 +282,6 @@ typedef struct
QFont *qFont;
QFont *qFontBox;
// HINSTANCE hInstance; /* parent window instance */
int iCmdShow;
USHORT ROWS; /* number of displayable rows in window */
@@ -307,7 +310,6 @@ typedef struct
int fontWeight; /* Bold level */
int fontQuality; /* requested font quality */
char fontFace[ LF_FACESIZE ]; /* requested font face name LF_FACESIZE #defined in wingdi.h */
// HFONT hFont; /* current font handle */
HWND hWnd; /* the window handle */
BOOL fInit; /* logical variable indicating that window should be open */

27
harbour/contrib/gtqtc/qtconsolearea.cpp
View File

@@ -171,13 +171,6 @@ void ConsoleArea::paintEvent(QPaintEvent * /* event */)
font = QFont(font, painter.device());
QFontMetrics fontMetrics( font );
int height = fontMetrics.height();
#if 0
QBrush brush( QColor( 200,11,131 ) );
painter.setBackground( brush );
QPen pen( QColor( 100,100,100 ) );
painter.setPen( pen );
#endif
painter.setFont(font);
painter.setBackgroundMode(Qt::OpaqueMode);
{
@@ -205,15 +198,11 @@ void ConsoleArea::paintEvent(QPaintEvent * /* event */)
}
else if( bColor != bOldColor )
{
#if 0
//QBrush brush( COLORS[ ( bOldColor >> 4 ) & 0x0F ] );
QBrush brush( QColor( 200,11,131 ) );
QBrush brush( COLORS[ bOldColor >> 4 ] );
painter.setBackground( brush );
//painter.setPen( QColor( COLORS[ ( bOldColor & 0x0F ) ] ) );
QPen pen( QColor( 100,100,100 ) );
QPen pen( COLORS[ bOldColor ] );
painter.setPen( pen );
#endif
painter.drawText( QPointF( startCol,iTop ), QString( text ) );
bOldColor = bColor;
@@ -225,13 +214,11 @@ void ConsoleArea::paintEvent(QPaintEvent * /* event */)
}
if( len > 0 )
{
#if 0
QBrush brush( QColor( 200,11,131 ) );
painter.setBackground( brush );
QBrush brush( COLORS[ bOldColor >> 4 ] );
painter.setBackground( brush );
QPen pen( COLORS[ bOldColor ] );
painter.setPen( pen );
QPen pen( QColor( 100,100,100 ) );
painter.setPen( pen );
#endif
painter.drawText(QPointF(startCol,iTop),QString(text));
}
}

3
harbour/contrib/gtqtc/qtmainwindow.cpp
View File

@@ -138,7 +138,8 @@ void MainWindow::createActions()
openAct->setShortcut(tr("Ctrl+O"));
connect(openAct, SIGNAL(triggered()), this, SLOT(open()));
foreach (QByteArray format, QImageWriter::supportedImageFormats()) {
foreach (QByteArray format, QImageWriter::supportedImageFormats())
{
QString text = tr("%1...").arg(QString(format).toUpper());
QAction *action = new QAction(text, this);